apply --recount, was Re: [PATCH v4] git-add--interactive: manual hunk editing mode

Hi,

On Mon, 23 Jun 2008, Jeff King wrote:

On Mon, Jun 23, 2008 at 07:54:29PM +0100, Johannes Schindelin wrote:

quoted

I am not sure when I will have time for that (particularly given that 
I got sidetracked with the OPTION_OPTIONS patch, when I should have 
worked on something completely different).

Heh, I know the feeling. ;)

Yes, us mere mortals cannot hack on Linux and Git all the time, much as 
we would like to (be able to).

quoted

In the meantime, feel free to submit in my name.

Do you remember off the top of your head whether more work was needed? 
They looked good to me, but then I seem to recall you saying in another 
thread that Junio pointed out some flaw with your approach (but I never 
quite understood what the flaw was).

I think it was not a flaw, but something to be worried about: 

http://mid.gmane.org/7v4p87zcv6.fsf@gitster.siamese.dyndns.org

To spare you following that link: Junio wanted to reuse "git apply 
--recount" to apply mboxes, where a separator "^-- $" to the signature is 
quite common, and could be mistaken for a "-" line of a hunk.

I am not quite sure how to deal with this; "--recount=nosig" (assume there 
is no signature) and "--recount=stripsig" (assume that "^-- $" is a 
lead-in to a signature) come to mind, defaulting to "nosig" with a 
warning.

However, I think that this issue should not concern us _now_.  As long as 
--recount is only to be used in "add -i" and "add -e", I think the patch 
is good as is:

http://repo.or.cz/w/git/dscho.git?a=commitdiff;h=c95d4b3da2e5f595f600720b91b8e396b43fe0ae

Ciao,
Dscho