Merge branch 'ar/t4150-am-scissors-test-fix'

Test fix.

* ar/t4150-am-scissors-test-fix:
t4150: fix broken test for am --scissors

diff --combined t/t4150-am.sh
index 1ebc587f8fc0010713f52196206462fa915cbca5,91a3bb2bac8b4ce8c7624a6231f15ce7c9249fb4..01867a989885e1272e998df54375b74438a8059e
--- 1/t/t4150-am.sh
--- 2/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@@ -69,13 -69,15 +69,15 @@@ test_expect_success 'setup: messages' 
  
        EOF
  
-       cat >scissors-msg <<-\EOF &&
-       Test git-am with scissors line
+       cat >msg-without-scissors-line <<-\EOF &&
+       Test that git-am --scissors cuts at the scissors line
  
        This line should be included in the commit message.
        EOF
  
-       cat - scissors-msg >no-scissors-msg <<-\EOF &&
+       printf "Subject: " >subject-prefix &&
+ 
+       cat - subject-prefix msg-without-scissors-line >msg-with-scissors-line <<-\EOF &&
        This line should not be included in the commit message with --scissors enabled.
  
         - - >8 - - remove everything above this line - - >8 - -
@@@ -140,26 -142,25 +142,25 @@@ test_expect_success setup 
                echo "# User $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
                echo "# Date $test_tick 25200" &&
                echo "#      $(git show --pretty="%aD" -s second)" &&
 -              echo "# Node ID $_z40" &&
 -              echo "# Parent  $_z40" &&
 +              echo "# Node ID $ZERO_OID" &&
 +              echo "# Parent  $ZERO_OID" &&
                cat msg &&
                echo &&
                git diff-tree --no-commit-id -p second
        } >patch1-hg.eml &&
  
  
-       echo scissors-file >scissors-file &&
-       git add scissors-file &&
-       git commit -F scissors-msg &&
-       git tag scissors &&
-       git format-patch --stdout scissors^ >scissors-patch.eml &&
+       echo file >file &&
+       git add file &&
+       git commit -F msg-without-scissors-line &&
+       git tag expected-for-scissors &&
        git reset --hard HEAD^ &&
  
-       echo no-scissors-file >no-scissors-file &&
-       git add no-scissors-file &&
-       git commit -F no-scissors-msg &&
-       git tag no-scissors &&
-       git format-patch --stdout no-scissors^ >no-scissors-patch.eml &&
+       echo file >file &&
+       git add file &&
+       git commit -F msg-with-scissors-line &&
+       git tag expected-for-no-scissors &&
+       git format-patch --stdout expected-for-no-scissors^ >patch-with-scissors-line.eml &&
        git reset --hard HEAD^ &&
  
        sed -n -e "3,\$p" msg >file &&
@@@ -416,10 -417,10 +417,10 @@@ test_expect_success 'am --scissors cut
        rm -fr .git/rebase-apply &&
        git reset --hard &&
        git checkout second &&
-       git am --scissors scissors-patch.eml &&
+       git am --scissors patch-with-scissors-line.eml &&
        test_path_is_missing .git/rebase-apply &&
-       git diff --exit-code scissors &&
-       test_cmp_rev scissors HEAD
+       git diff --exit-code expected-for-scissors &&
+       test_cmp_rev expected-for-scissors HEAD
  '
  
  test_expect_success 'am --no-scissors overrides mailinfo.scissors' '
@@@ -427,10 -428,10 +428,10 @@@
        git reset --hard &&
        git checkout second &&
        test_config mailinfo.scissors true &&
-       git am --no-scissors no-scissors-patch.eml &&
+       git am --no-scissors patch-with-scissors-line.eml &&
        test_path_is_missing .git/rebase-apply &&
-       git diff --exit-code no-scissors &&
-       test_cmp_rev no-scissors HEAD
+       git diff --exit-code expected-for-no-scissors &&
+       test_cmp_rev expected-for-no-scissors HEAD
  '
  
  test_expect_success 'setup: new author and committer' '
@@@ -662,11 -663,6 +663,11 @@@ test_expect_success 'am pauses on confl
        test -d .git/rebase-apply
  '
  
 +test_expect_success 'am --show-current-patch' '
 +      git am --show-current-patch >actual.patch &&
 +      test_cmp .git/rebase-apply/0001 actual.patch
 +'
 +
  test_expect_success 'am --skip works' '
        echo goodbye >expected &&
        git am --skip &&
@@@ -1050,16 -1046,4 +1051,16 @@@ test_expect_success 'am works with mult
        git cat-file commit HEAD | grep "^$LONG$"
  '
  
 +test_expect_success 'am --quit keeps HEAD where it is' '
 +      mkdir .git/rebase-apply &&
 +      >.git/rebase-apply/last &&
 +      >.git/rebase-apply/next &&
 +      git rev-parse HEAD^ >.git/ORIG_HEAD &&
 +      git rev-parse HEAD >expected &&
 +      git am --quit &&
 +      test_path_is_missing .git/rebase-apply &&
 +      git rev-parse HEAD >actual &&
 +      test_cmp expected actual
 +'
 +
  test_done