diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-10-19 14:15:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-10-19 14:15:51 -0700 |
commit | c7deb8dac1f24498a353327ec9fceb99695582c2 (patch) | |
tree | 58c819d4a87c8e4fed16fdc615ce8579a4230536 /t/t9001-send-email.sh | |
parent | 38a18873b21f6f2eebedc65aff2249fd6ec2168c (diff) | |
parent | 5b57413cb3952654031115f6f840e3dcb120914e (diff) | |
download | git-c7deb8dac1f24498a353327ec9fceb99695582c2.tar.gz |
Merge branch 'maint'
* maint:
t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
Clarify and extend the "git diff" format documentation
git-show-ref.txt: clarify the pattern matching
documentation: git-config minor cleanups
Update test script annotate-tests.sh to handle missing/extra authors
Diffstat (limited to 't/t9001-send-email.sh')
-rwxr-xr-x | t/t9001-send-email.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 6f67da4e71..a298eb0437 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -279,7 +279,7 @@ test_expect_success $PREREQ 'Invalid In-Reply-To' ' --to=nobody@example.com \ --in-reply-to=" " \ --smtp-server="$(pwd)/fake.sendmail" \ - $patches + $patches \ 2>errors ! grep "^In-Reply-To: < *>" msgtxt1 ' |