Merge branch 'jc/builtin-am-signoff-regression-fix'

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 5e4855595bf31bc1de1355b856d531669e7f7ae1..b41bd17264f93d54d5aa280fbc305cebb18950a0 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -873,6 +873,42 @@ test_expect_success 'am --message-id -s signs off after the message id' '
        test_cmp expected actual
 '
 
+test_expect_success 'am -3 works with rerere' '
+       rm -fr .git/rebase-apply &&
+       git reset --hard &&
+
+       # make patches one->two and two->three...
+       test_commit one file &&
+       test_commit two file &&
+       test_commit three file &&
+       git format-patch -2 --stdout >seq.patch &&
+
+       # and create a situation that conflicts...
+       git reset --hard one &&
+       test_commit other file &&
+
+       # enable rerere...
+       test_config rerere.enabled true &&
+       test_when_finished "rm -rf .git/rr-cache" &&
+
+       # ...and apply. Our resolution is to skip the first
+       # patch, and the rerere the second one.
+       test_must_fail git am -3 seq.patch &&
+       test_must_fail git am --skip &&
+       echo resolved >file &&
+       git add file &&
+       git am --resolved &&
+
+       # now apply again, and confirm that rerere engaged (we still
+       # expect failure from am because rerere does not auto-commit
+       # for us).
+       git reset --hard other &&
+       test_must_fail git am -3 seq.patch &&
+       test_must_fail git am --skip &&
+       echo resolved >expect &&
+       test_cmp expect file
+'
+
 test_expect_success 'am -s unexpected trailer block' '
        rm -fr .git/rebase-apply &&
        git reset --hard &&