Re: 'git diff' in rebase--interactive

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Oct 9, 2007, 12:35 UTC
Message-ID: <470B7581.3030301@viscovery.net>
In-Reply-To: <Pine.LNX.4.64.0710091319400.4174@racer.site>

Johannes Schindelin schrieb:

Show 7 quoted lines

> On Tue, 9 Oct 2007, Johannes Sixt wrote:
> 
>> I wonder for what reason rebase--interactive generates a patch using 
>> 'git diff' in the make_patch function. Is this an artefact?
> 
> It was an explicit request by people who use git-rebase regularly, and 
> missed being able to see the patch in --interactive.

Can we generate the patch with plumbing, diff-{files,index,tree}? They by-pass any diff drivers.

Show 5 quoted lines

>> I'd like to get rid of this use of 'git diff' because it invokes 
>> external diff drivers, which is totally unwanted if the driver is 
>> interactive - like the 'windiff' thing that I posted a week ago.
> 
> So you do not want to be able to run git-rebase (without -i)?

It wouldn't work anyway in my use-case (versioned Word documents), but rebase -m and rebase -i could run without manual intervention as long as there are no content merges.

In this particular case, I only wanted to amend the message of a commit 3 steps down in the history, and I had not expected any diff drivers to be fired up.

-- Hannes