diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-26 21:36:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-26 22:22:22 -0700 |
| commit | 017678b4f47dc1b2a6691631373c46daf8f63206 (patch) | |
| tree | cf2a657570db595a71a35f7820a80eb2ded84309 /t/t5100-mailinfo.sh | |
| parent | f43c97f5720f48598e59629f7dc9892d082d8b0e (diff) | |
| download | git-017678b4f47dc1b2a6691631373c46daf8f63206.tar.gz | |
am/mailinfo: Disable scissors processing by default
You can enable it by giving --scissors to "git am".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100-mailinfo.sh')
| -rwxr-xr-x | t/t5100-mailinfo.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh index e848556659..0279d07c83 100755 --- a/t/t5100-mailinfo.sh +++ b/t/t5100-mailinfo.sh @@ -13,16 +13,24 @@ test_expect_success 'split sample box' \ echo total is $last && test `cat last` = 14' +check_mailinfo () { + mail=$1 opt=$2 + mo="$mail$opt" + git mailinfo -u $opt msg$mo patch$mo <$mail >info$mo && + test_cmp "$TEST_DIRECTORY"/t5100/msg$mo msg$mo && + test_cmp "$TEST_DIRECTORY"/t5100/patch$mo patch$mo && + test_cmp "$TEST_DIRECTORY"/t5100/info$mo info$mo +} + + for mail in `echo 00*` do test_expect_success "mailinfo $mail" ' - git mailinfo -u msg$mail patch$mail <$mail >info$mail && - echo msg && - test_cmp "$TEST_DIRECTORY"/t5100/msg$mail msg$mail && - echo patch && - test_cmp "$TEST_DIRECTORY"/t5100/patch$mail patch$mail && - echo info && - test_cmp "$TEST_DIRECTORY"/t5100/info$mail info$mail + check_mailinfo $mail "" && + if test -f "$TEST_DIRECTORY"/t5100/msg$mail--scissors + then + check_mailinfo $mail --scissors + fi ' done |