Re: git cherry-pick feature request

From: Paul Mackerras <paulus@samba.org>
Date: Aug 23, 2006, 13:07 UTC
Message-ID: <17644.21269.128308.313284@cargo.ozlabs.ibm.com>
In-Reply-To: <7vfyfnixv5.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano writes:

> Quiet sounds sane.
> 
> Reverting to its "previous state" I am not quite sure if it is
> worth making it an option and run it as part of cherry-pick.

OK. If the git cherry-pick terminates with an error I'll get gitk to show the error message (if any) it printed along with a warning that the working directory might need to be cleaned up. I don't really want to do a git reset automagically since the user might have local modifications that they want to preserve.

While I'm asking for features, another one that would be really useful for another tool I'm writing is a 3-way diff for a file between the working directory, the index, and the current head commit, something like what git diff-tree -c does for merges. That is, it would have two columns of +/-/space characters, one for the current head and one for the index. A '-' would indicate that the line appears in the current head or the index but not in the version of the file in the working directory. A '+' would indicate that the line appears in the working directory version.

How hard would it be to adapt the git diff-tree -c mechanism to work on two blobs plus the file from the working directory?

Thanks, Paul.