diff options
| author | Phil Hord <hordp@cisco.com> | 2012-07-10 18:52:28 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-17 10:59:17 -0700 |
| commit | 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 (patch) | |
| tree | 7f5fa1c98bca0b31bce92d861d560ff2bd99b62a /t/t7610-mergetool.sh | |
| parent | 79dc2d0b0250b4a90dfc83ae69c116e08c9df0a3 (diff) | |
| download | git-743bf6d8b07f0c5717bf5c37b8b50ae9de619c83.tar.gz | |
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 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 725f316861..6fa0c70506 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 && |