diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2011-08-29 22:10:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-29 15:27:05 -0700 |
| commit | 688f4f2fbc353887dbe77c450aaad2ccfd13e8fc (patch) | |
| tree | 316278550888399fd6fc65e5988f6227dd0b2f7f | |
| parent | 2fdb5c6219ffe17f40833f32541af764ed2364db (diff) | |
| download | git-688f4f2fbc353887dbe77c450aaad2ccfd13e8fc.tar.gz | |
t4014: "no-add-headers" is actually called "no-add-header"
Since c426003 (format-patch: add --no-cc, --no-to, and
--no-add-headers, 2010-03-07) the tests have checked for an option
called --no-add-headers introduced by letting the user negate
--add-header.
However, the parseopt machinery does not automatically pluralize
anything, so it is in fact called --no-add-header.
Since the option never worked, is not documented anywhere, and
implementing an actual --no-add-headers would lead to silly code
complications, we just adapt the test to the code.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4014-format-patch.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index a45d4fbd03..5cbc066e68 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -219,11 +219,11 @@ test_expect_success '--no-cc overrides config.cc' ' ! grep "^Cc: C. E. Cipient <rcipient@example.com>\$" patch12 ' -test_expect_failure '--no-add-headers overrides config.headers' ' +test_expect_success '--no-add-header overrides config.headers' ' git config --replace-all format.headers \ "Header1: B. E. Cipient <rcipient@example.com>" && - git format-patch --no-add-headers --stdout master..side | + git format-patch --no-add-header --stdout master..side | sed -e "/^\$/q" >patch13 && check_patch patch13 && ! grep "^Header1: B. E. Cipient <rcipient@example.com>\$" patch13 |