Re: [PATCH] git-add--interactive: manual hunk editing mode

From: Jeff King <peff@peff.net>
Date: May 29, 2008, 18:58 UTC
Message-ID: <20080529185808.GA2140@sigill.intra.peff.net>
In-Reply-To: <200805291737.53291.trast@student.ethz.ch>

On Thu, May 29, 2008 at 05:37:51PM +0200, Thomas Rast wrote:

Show 8 quoted lines

> You wrote:
> > Adds a new option 'e' to the 'add -p' command loop that lets you
> > discard or keep one hunk line at a time.  This is useful if there are
> > no unchanged lines in the middle of the hunk, so 's' will not work,
> > but you would still like to split it.
> 
> Any news on this?  I would greatly appreciate criticism if something
> is wrong or inadequate :-)

[please just repost the patch when issuing such gentle reminders -- it saves the rest of us from digging it out of the archive]

I have often wanted to perform this operation, and your implementation seems to work from my minimal testing (though I haven't looked closely at the colorization implications).

But I find the interface a bit clunky. I would much rather get dumped in my favorite editor, which happens to be quite fast at removing a subset of lines. After editing, any lines remaining would be staged.

We would have to figure out what happens if lines are added or edited, of course. It may be right to signal an error, or maybe there is some other useful functionality that can come of that. I think other systems have some diff-editing functionality (IIRC, cogito did). It is probably worth looking at that for ideas.

-Peff