Same here. The error message from James actually sounds like he might have run afoul of git apply without --index and then did not correct with git reset --hard.
James, what does git status configure.ac declare at your site?
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Anonymous
-
2019-11-12
Yes a git reset --hard helped. I do use the git apply with index switch. But I wasn't hard resetting dev/local_working (just staging). So I was occasionally getting an uncommitted .ac file left. Anyway, all good now.
👍
1
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Diff:
Can you rebase the patch or something?
when I try toa pply to current master I get
error: configure.ac: does not match index
Just now, I ran these commands to test the patch from the code review, and there was no problem. I'm not sure where to go from here.
Never use the
patchprogram to apply git patches. The correct way is to usegit apply --index
OK, thanks. I've tried that, and still there is no error.
Same here. The error message from James actually sounds like he might have run afoul of git apply without --index and then did not correct with git reset --hard.
James, what does
git status configure.acdeclare at your site?Yes a git reset --hard helped. I do use the git apply with index switch. But I wasn't hard resetting dev/local_working (just staging). So I was occasionally getting an uncommitted .ac file left. Anyway, all good now.
Passes make make check and a full make doc.
Patch on countdown for Nov 16th
Patch counted down - please push.
commit f59c52cb588830e3d86f33793288f464df80b7f0
Author: Dan Eble nine.fierce.ballads@gmail.com
Date: Tue Oct 29 10:36:48 2019 -0400
commit 76065ff7604b335811b140bf3a6544f72710cee3
Author: Dan Eble nine.fierce.ballads@gmail.com
Date: Tue Oct 29 10:36:48 2019 -0400