diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 01:28:43 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 01:58:39 (GMT) |
| commit | 89d750bf6fa025edeb31ad258cdd09a27a5c02fa (patch) | |
| tree | 4d39de078c00f56b2c17eaef94989d098dd4621d /git-stash.sh | |
| parent | d7b0a09316fe8dcb62ad247dbbb45c3c777667ad (diff) | |
| download | git-89d750bf6fa025edeb31ad258cdd09a27a5c02fa.zip git-89d750bf6fa025edeb31ad258cdd09a27a5c02fa.tar.gz git-89d750bf6fa025edeb31ad258cdd09a27a5c02fa.tar.bz2 | |
Avoid invoking diff drivers during git-stash
git-stash needs to restrict itself to plumbing when running automated
diffs as part of its operation as the user may have configured a
custom diff driver that opens an interactive UI for certain/all
files. Doing that during scripted actions is very unfriendly to
the end-user and may cause git-stash to fail to work.
Reported by Johannes Sixt
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-stash.sh b/git-stash.sh index 7ba6162..def3163 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -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 } apply_stash () { @@ -139,7 +139,7 @@ apply_stash () { unstashed_index_tree= if test -n "$unstash_index" && test "$b_tree" != "$i_tree" then - git diff --binary $s^2^..$s^2 | git apply --cached + git diff-tree --binary $s^2^..$s^2 | git apply --cached test $? -ne 0 && die 'Conflicts in index. Try without --index.' unstashed_index_tree=$(git-write-tree) || @@ -162,7 +162,7 @@ apply_stash () { git read-tree "$unstashed_index_tree" else a="$TMP-added" && - git diff --cached --name-only --diff-filter=A $c_tree >"$a" && + git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" && git read-tree --reset $c_tree && git update-index --add --stdin <"$a" || die "Cannot unstage modified files" |