The presence of a GIT_DIR/MERGE_RR file indicates we
were resolving a merge which had rerere candidates for
recording.  But the file does not get deleted after
all resolutions are completed.  This is ok for most
cases because the file will get replaced when the
next merge happens.  But stash apply directly uses
a merge backend, which is not supported by rerere.
The prior rerere state is left behind (in MERGE_RR)
rather than being cleaned up or overwritten as it
would with a normal merge.

This then confuses mergetool who thinks a rerere
operation is in play when it is not.

When we encounter a conflicted stash,  ask rerere to
clean up with 'git rerere clear'.  This is safe to do
since we know that rerere is not taking part in this
conflict resolution, and any previous unresolved rerere
activity would have prevented us from attempting the
stash apply in the first place.

Change the test for this flaw to expect success.

Signed-off-by: Phil Hord <ho...@cisco.com>
Mentored-by: Junio C Hamano <gits...@pobox.com>
---
 git-stash.sh         | 1 +
 t/t7610-mergetool.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-stash.sh b/git-stash.sh
index 4e2c7f8..5bd45ef 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 clear
                if test -n "$INDEX_OPTION"
                then
                        gettextln "Index was not unstashed." >&2
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 2796c53..99e8c1d 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -203,7 +203,7 @@ test_expect_success 'mergetool skips resolved paths when 
rerere is active' '
     git reset --hard
 '
 
-test_expect_failure 'mergetool ignores rerere in git-stash conflicts'  '
+test_expect_success 'mergetool ignores rerere in git-stash conflicts'  '
     git checkout -b stash3 stash1 &&
     git config rerere.enabled true &&
     echo "Conflicting stash content" >file11 &&
-- 
1.7.11.1.213.gb567ea5.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to