Merge branch 'pt/am-foreign'

[thirdparty/git.git] / t / t4150-am.sh

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 3ebafd9234170f01f422bf063a7fee6b9e5b5dee..3320fa6315e84031fff646a061ef7ed6467e411c 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -356,15 +356,21 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '
        grep "^\[foo\] third" actual
 '
 
-test_expect_success 'am -3 falls back to 3-way merge' '
+test_expect_success 'setup am -3' '
        rm -fr .git/rebase-apply &&
        git reset --hard &&
-       git checkout -b lorem2 master2 &&
+       git checkout -b base3way master2 &&
        sed -n -e "3,\$p" msg >file &&
        head -n 9 msg >>file &&
        git add file &&
        test_tick &&
-       git commit -m "copied stuff" &&
+       git commit -m "copied stuff"
+'
+
+test_expect_success 'am -3 falls back to 3-way merge' '
+       rm -fr .git/rebase-apply &&
+       git reset --hard &&
+       git checkout -b lorem2 base3way &&
        git am -3 lorem-move.patch &&
        test_path_is_missing .git/rebase-apply &&
        git diff --exit-code lorem
@@ -373,12 +379,7 @@ test_expect_success 'am -3 falls back to 3-way merge' '
 test_expect_success 'am -3 -p0 can read --no-prefix patch' '
        rm -fr .git/rebase-apply &&
        git reset --hard &&
-       git checkout -b lorem3 master2 &&
-       sed -n -e "3,\$p" msg >file &&
-       head -n 9 msg >>file &&
-       git add file &&
-       test_tick &&
-       git commit -m "copied stuff" &&
+       git checkout -b lorem3 base3way &&
        git am -3 -p0 lorem-zero.patch &&
        test_path_is_missing .git/rebase-apply &&
        git diff --exit-code lorem
@@ -420,12 +421,7 @@ test_expect_success 'am -3 can rename a file after falling back to 3-way merge'
 test_expect_success 'am -3 -q is quiet' '
        rm -fr .git/rebase-apply &&
        git checkout -f lorem2 &&
-       git reset master2 --hard &&
-       sed -n -e "3,\$p" msg >file &&
-       head -n 9 msg >>file &&
-       git add file &&
-       test_tick &&
-       git commit -m "copied stuff" &&
+       git reset base3way --hard &&
        git am -3 -q lorem-move.patch >output.out 2>&1 &&
        ! test -s output.out
 '