Re: [PATCH] git-add --interactive (wip)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Dec 12, 2006, 22:15 UTC
Message-ID: <Pine.LNX.4.63.0612122311400.2807@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vwt4wpytm.fsf@assigned-by-dhcp.cox.net>

Hi,

On Tue, 12 Dec 2006, Junio C Hamano wrote:

Show 6 quoted lines

> I've updated my "git add --interactive" in 'pu' and it now knows how to 
> split a hunk into smaller pieces and recounting the diff offsets before 
> applying (Johannes pointed out that his partial commit script, entirely 
> written in bash using shell arrays, has a similar feature.  I guess I 
> should have stolen his code instead of lifting the logic from my own 
> abandoned porcelain).

Well, not completely true. I do not split hunks into subhunks.

Note that you _could_ split hunks at arbitrary lines; if it is a line common between the two files, it is easier though.

And you could not have ripped from my script: I make heavy use of bash arrays (in fact, I wrote this script partly to learn how to work with bash arrays). If I could think of a clean way to spawn processes piped into "less -FS" several times from a C program, I would already have rewritten it in C.

> So in short, I think per-hunk update-index is a cute hack and may be 
> useful in a narrow simple cases, but it would not be so useful in the 
> real life.

To the contrary! In spite of having written git-hunk-commit to please those poor souls coming from the darcs side, I already used it myself quite often! I think it is a killer feature.

Ciao, Dscho