Re: [PATCH] Avoid invoking diff drivers during git-stash

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Oct 19, 2007, 06:08 UTC
Message-ID: <471849D7.1020303@viscovery.net>
In-Reply-To: <20071019013350.GA14020@spearce.org>

Shawn,

thanks for the fast response with a patch.

Shawn O. Pearce schrieb:

Show 9 quoted lines

>  Johannes Sixt <j.sixt@viscovery.net> wrote:
>  > (1) Looking at git-stash.sh I see a few uses of 'git diff' in
>  > apply_stash(). Shouldn't these use one of git-diff-{tree,index,files)? The
>  > reason is that porcelain 'git diff' invokes custom diff drivers (that in my   
>  > case run a UI program), whereas the plumbing does not.
>  >
>  > Is there a particular reason to use porcelain 'git diff'?
> 
>  Does this fix the problem?

It does!

Show 6 quoted lines

> @@ -110,7 +110,7 @@ show_stash () {
>  
>  	w_commit=$(git rev-parse --verify "$s") &&
>  	b_commit=$(git rev-parse --verify "$s^") &&
> -	git diff $flags $b_commit $w_commit
> +	git diff-tree $flags $b_commit $w_commit

However, this porcelain 'git diff' should actually remain because it's part of show_stash().

-- Hannes