mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Test fix.

* ar/t4150-am-scissors-test-fix:
  t4150: fix broken test for am --scissors
This commit is contained in:
Junio C Hamano
2018-08-17 13:09:59 -07:00
parent c757aa2d12 b7446fcfdf
commit 2c8c407d0a
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
t/t4150-am.sh
View File

@ -69,13 +69,15 @@ test_expect_success 'setup: messages' '
EOF EOF
cat >scissors-msg <<-\EOF && cat >msg-without-scissors-line <<-\EOF &&
Test git-am with scissors line Test that git-am --scissors cuts at the scissors line
This line should be included in the commit message. This line should be included in the commit message.
EOF 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. This line should not be included in the commit message with --scissors enabled.
- - >8 - - remove everything above this line - - >8 - - - - >8 - - remove everything above this line - - >8 - -
@ -148,18 +150,17 @@ test_expect_success setup '
} >patch1-hg.eml && } >patch1-hg.eml &&
echo scissors-file >scissors-file && echo file >file &&
git add scissors-file && git add file &&
git commit -F scissors-msg && git commit -F msg-without-scissors-line &&
git tag scissors && git tag expected-for-scissors &&
git format-patch --stdout scissors^ >scissors-patch.eml &&
git reset --hard HEAD^ && git reset --hard HEAD^ &&
echo no-scissors-file >no-scissors-file && echo file >file &&
git add no-scissors-file && git add file &&
git commit -F no-scissors-msg && git commit -F msg-with-scissors-line &&
git tag no-scissors && git tag expected-for-no-scissors &&
git format-patch --stdout no-scissors^ >no-scissors-patch.eml && git format-patch --stdout expected-for-no-scissors^ >patch-with-scissors-line.eml &&
git reset --hard HEAD^ && git reset --hard HEAD^ &&
sed -n -e "3,\$p" msg >file && sed -n -e "3,\$p" msg >file &&
@ -416,10 +417,10 @@ test_expect_success 'am --scissors cuts the message at the scissors line' '
rm -fr .git/rebase-apply && rm -fr .git/rebase-apply &&
git reset --hard && git reset --hard &&
git checkout second && git checkout second &&
git am --scissors scissors-patch.eml && git am --scissors patch-with-scissors-line.eml &&
test_path_is_missing .git/rebase-apply && test_path_is_missing .git/rebase-apply &&
git diff --exit-code scissors && git diff --exit-code expected-for-scissors &&
test_cmp_rev scissors HEAD test_cmp_rev expected-for-scissors HEAD
' '
test_expect_success 'am --no-scissors overrides mailinfo.scissors' ' test_expect_success 'am --no-scissors overrides mailinfo.scissors' '
@ -427,10 +428,10 @@ test_expect_success 'am --no-scissors overrides mailinfo.scissors' '
git reset --hard && git reset --hard &&
git checkout second && git checkout second &&
test_config mailinfo.scissors true && 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 && test_path_is_missing .git/rebase-apply &&
git diff --exit-code no-scissors && git diff --exit-code expected-for-no-scissors &&
test_cmp_rev no-scissors HEAD test_cmp_rev expected-for-no-scissors HEAD
' '
test_expect_success 'setup: new author and committer' ' test_expect_success 'setup: new author and committer' '