| commit | 89d750bf6fa025edeb31ad258cdd09a27a5c02fa | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 19 Oct 2007 01:28:43 +0000 (18 21:28 -0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 19 Oct 2007 01:58:39 +0000 (18 21:58 -0400) | ||
| tree | 4d39de078c00f56b2c17eaef94989d098dd4621d | treesnapshot (tar.gz zip) |
| parent | d7b0a09316fe8dcb62ad247dbbb45c3c777667ad | commitdiff |
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>
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>
| git-stash.sh | diffblobblamehistory |