Add a failing test to confirm the leftover rerere
state files interfere with git-mergetool during a
conflicted stash apply.
Signed-off-by: Phil Hord <ho...@cisco.com>
---
t/t7610-mergetool.sh | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index f5e16fc..2796c53 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -55,6 +55,16 @@ test_expect_success 'setup' '
git rm file12 &&
git commit -m "branch1 changes" &&
+ git checkout -b stash1 master &&
+ echo stash1 change file11 >file11 &&
+ git add file11 &&
+ git commit -m "stash1 changes" &&
+
+ git checkout -b stash2 master &&
+ echo stash2 change file11 >file11 &&
+ git add file11 &&
+ git commit -m "stash2 changes" &&
+
git checkout master &&
git submodule update -N &&
echo master updated >file1 &&
@@ -193,7 +203,25 @@ test_expect_success 'mergetool skips resolved paths when
rerere is active' '
git reset --hard
'
+test_expect_failure 'mergetool ignores rerere in git-stash conflicts' '
+ git checkout -b stash3 stash1 &&
+ git config rerere.enabled true &&
+ echo "Conflicting stash content" >file11 &&
+ git stash &&
+ test_must_fail git merge stash2 &&
+ echo resolved >file11 &&
+ git add file11 &&
+ git commit -mResolved-previous-conflict &&
+ test -e .git/MERGE_RR &&
+ test_must_fail git stash apply &&
+ test_must_fail test -e .git/MERGE_RR &&
+ test -n "$(git ls-files -u)" &&
+ output="$(git mergetool --no-prompt)" &&
+ test "$output" != "No files need merging"
+'
+
test_expect_success 'mergetool takes partial path' '
+ git reset --hard
git config rerere.enabled false &&
git checkout -b test12 branch1 &&
git submodule update -N &&
--
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
