# [PATCH v3 1/2] test: git-stash conflict sets up rerere 3 messages from 2012-07-10 to 2012-08-17. Participants: Phil Hord, Junio C Hamano. Thread: https://gitlist.dev/t/30992 ## Phil Hord, 2012-07-10 22:52 Subject: [PATCH v3 1/2] test: git-stash conflict sets up rerere Message-ID: <1341960748-26949-1-git-send-email-hordp@cisco.com> URL: https://gitlist.dev/e/1341960748-26949-1-git-send-email-hordp%40cisco.com ``` Add a failing test to confirm a conflicted stash apply invokes rerere to record the conflicts and resolve the the files it can. mergetool may be confused by a left-over state from previous rerere activity causing it to think no files have conflicts even though they do. This condition is not verified by this test since a subsequent commit will change the behavior to enable rerere for stash conflicts. Also, the next test expected us to finish up with a reset, which is impossible to do if we fail (as we must) and it's an unreasonable expectation anyway. Begin the next test with a reset of his own instead. Signed-off-by: Phil Hord --- t/t7610-mergetool.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index f5e16fc..725f316 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,35 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' ' git reset --hard ' +test_expect_failure 'conflicted stash sets up rerere' ' + git config rerere.enabled true && + git checkout stash1 && + echo "Conflicting stash content" >file11 && + git stash && + + git checkout --detach stash2 && + test_must_fail git stash apply && + + test -n "$(git ls-files -u)" && + conflicts="$(git rerere remaining)" && + test "$conflicts" = "file11" && + output="$(git mergetool --no-prompt)" && + test "$output" != "No files need merging" && + + git commit -am "save the stash resolution" && + + git reset --hard stash2 && + test_must_fail git stash apply && + + test -n "$(git ls-files -u)" && + conflicts="$(git rerere remaining)" && + test -z "$conflicts" && + 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 ``` ## Phil Hord, 2012-07-10 22:52 Subject: [PATCH v3 2/2] stash: invoke rerere in case of conflict Message-ID: <1341960748-26949-2-git-send-email-hordp@cisco.com> URL: https://gitlist.dev/e/1341960748-26949-2-git-send-email-hordp%40cisco.com In-Reply-To: <1341960748-26949-1-git-send-email-hordp@cisco.com> ``` '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 Change the test for this flaw to expect success. Signed-off-by: Phil Hord Mentored-by: Junio C Hamano --- 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..bbefdf6 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 diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 725f316..6fa0c70 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 'conflicted stash sets up rerere' ' +test_expect_success 'conflicted stash sets up rerere' ' git config rerere.enabled true && git checkout stash1 && echo "Conflicting stash content" >file11 && -- 1.7.11.1.213.gb567ea5.dirty ``` ## Junio C Hamano, 2012-08-17 18:01 Subject: Re: [PATCH v3 1/2] test: git-stash conflict sets up rerere Message-ID: <7v393lv1n6.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v393lv1n6.fsf%40alter.siamese.dyndns.org In-Reply-To: <1341960748-26949-1-git-send-email-hordp@cisco.com> ``` Phil Hord writes: > Add a failing test to confirm a conflicted stash apply > invokes rerere to record the conflicts and resolve the > the files it can. > > mergetool may be confused by a left-over > state from previous rerere activity causing it to > think no files have conflicts even though they do. > This condition is not verified by this test since a > subsequent commit will change the behavior to enable > rerere for stash conflicts. > > Also, the next test expected us to finish up with a reset, > which is impossible to do if we fail (as we must) and it's > an unreasonable expectation anyway. Begin the next test > with a reset of his own instead. > > Signed-off-by: Phil Hord > --- > t/t7610-mergetool.sh | 38 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh > index f5e16fc..725f316 100755 > --- a/t/t7610-mergetool.sh > +++ b/t/t7610-mergetool.sh > ... > test_expect_success 'mergetool takes partial path' ' > + git reset --hard I'll add " &&" at the end and queue. Thanks. > git config rerere.enabled false && > git checkout -b test12 branch1 && > git submodule update -N && ```