kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Shawn O. Pearce 2007-10-18 21:28:43 -04:00
parent d7b0a09316
commit 89d750bf6f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-stash.sh
View File

@ -110,7 +110,7 @@ show_stash () {


w_commit=$(git rev-parse --verify "$s") && w_commit=$(git rev-parse --verify "$s") &&
b_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 () { apply_stash () {
@ -139,7 +139,7 @@ apply_stash () {
unstashed_index_tree= unstashed_index_tree=
if test -n "$unstash_index" && test "$b_tree" != "$i_tree" if test -n "$unstash_index" && test "$b_tree" != "$i_tree"
then 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 && test $? -ne 0 &&
die 'Conflicts in index. Try without --index.' die 'Conflicts in index. Try without --index.'
unstashed_index_tree=$(git-write-tree) || unstashed_index_tree=$(git-write-tree) ||
@ -162,7 +162,7 @@ apply_stash () {
git read-tree "$unstashed_index_tree" git read-tree "$unstashed_index_tree"
else else
a="$TMP-added" && 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 read-tree --reset $c_tree &&
git update-index --add --stdin <"$a" || git update-index --add --stdin <"$a" ||
die "Cannot unstage modified files" die "Cannot unstage modified files"