From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Apr 2009 23:25:55 GMT
Subject: Re: [RFC PATCH] git add -p: new "quit" command at the prompt.
Message-ID: <7v7i1lqz24.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <vpqtz4rynhp.fsf@bauges.imag.fr>

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

> I think everybody agree that the intention of the patch is good (well,
> several pro, and no real counter-argument).

Oh, I think we have already passed that state long time ago.  It's queued
as c9cc8d9 ([NEEDS SIGN OFF, DOC, AND REVIEW] git add -p: new "quit"
command at the prompt., 2009-04-10) in 'pu'.

I agree that there is a "Huh?" factor in the repeated and similar hunks to
patch_update_file, but the first hunk is dealing with the mode change and
the second one is about the patch text.

Currently parse_diff_header() returns the mode line into $mode and the
main loop treats $mode differently from @hunk, which is an array of hunks
parsed by parse_diff().  Treating $mode as a "fake hunk" by unshifting it
at the beginning of @hunk array and teaching the main loop minor details
such as $mode "fake hunk" cannot be edited nor split, I suspect we _could_
unify the two.

ca72468 (add--interactive: allow user to choose mode update, 2008-03-27)
introduced this duplication.  Jeff, what do you think?  I am not sure if
it is worth it.