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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 6, 2008, 14:31 UTC
Message-ID: <alpine.DEB.1.00.0806061528270.1783@racer>
In-Reply-To: <20080606051026.GA18257@sigill.intra.peff.net>

Hi,

On Fri, 6 Jun 2008, Jeff King wrote:

Show 14 quoted lines

> On Thu, Jun 05, 2008 at 11:28:53AM +0100, Johannes Schindelin wrote:
> 
> > We have a tradition of giving the users plenty of rope.
> > 
> > And I actually like having the power at my finger tips.  You would not 
> > believe how I enjoyed using "git add -e" to commit the final version of 
> > that very patch.
> 
> I looked at your patch, and here are my complaints (versus what Thomas
> has been working on):
> 
>   1. You edit the whole diff, not just a hunk. Actually, I think this is
>      probably not a big deal, as any decent editor lets you find the
>      spot you're looking for pretty trivially.

Actually, this is exactly what I wanted. I positively _hate_ all the key presses I have to go through until I am finally where I want to be. I cannot just search for a term and be done with it. Reminds me of Windows-like dialog based configurations.

Show 7 quoted lines

>   2. It's not integrated into the git-add--interactive loop at all. That
>      is, I don't start out saying "I want to edit this diff." I look at
>      the diff while staging with "git add -p" and say "Oops, I need to
>      edit this hunk." So I think it is better implemented as an "e"
>      option in the hunk adding loop, with "git add -e" as a shortcut.
>      Or maybe there is simply room for both (and "git add -e", rather
>      than being a shortcut, just means "do this on the _whole_ file").

This is very much on purpose. I do not like "git add -i" at all. It limits my work unduly. That's why I tried to change the hunk editing in git-gui once upon a time, but I never got round to fix that, and it does not work well with ssh either.

So no, I do not want to use that perl script with that menu. I want to have the raw diff in a raw editor, where I can change the things I need to change.

Ciao, Dscho