summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorPhil Hord <hordp@cisco.com>2012-07-10 22:52:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-17 17:59:17 (GMT)
commit743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 (patch)
tree7f5fa1c98bca0b31bce92d861d560ff2bd99b62a /git-stash.sh
parent79dc2d0b0250b4a90dfc83ae69c116e08c9df0a3 (diff)
downloadgit-743bf6d8b07f0c5717bf5c37b8b50ae9de619c83.zip
git-743bf6d8b07f0c5717bf5c37b8b50ae9de619c83.tar.gz
git-743bf6d8b07f0c5717bf5c37b8b50ae9de619c83.tar.bz2
stash: invoke rerere in case of conflict
"stash apply" directly calls a backend merge function which does not automatically invoke rerere. This confuses mergetool when leftover rerere state is left behind from previous merges. Invoke rerere explicitly when we encounter a conflict during stash apply. This turns the test introduced by the previous commit to succeed. Signed-off-by: Phil Hord <hordp@cisco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-stash.sh b/git-stash.sh
index fe4ab28..63d2f59 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -469,6 +469,7 @@ apply_stash () {
else
# Merge conflict; keep the exit status from merge-recursive
status=$?
+ git rerere
if test -n "$INDEX_OPTION"
then
gettextln "Index was not unstashed." >&2