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>
Thomas Rast committed
Aug 29, 2011 at 22:10 UTC
688f4f2fbc353887dbe77c450aaad2ccfd13e8fc
1 file changed
+2
-2
t/t4014-format-patch.sh
+2
-2
@@ -219,11 +219,11 @@ test_expect_success '--no-cc overrides config.cc' '
219
! grep "^Cc: C. E. Cipient <rcipient@example.com>\$" patch12
220
'
221
222
-test_expect_failure '--no-add-headers overrides config.headers' '
222
+test_expect_success '--no-add-header overrides config.headers' '
223
224
git config --replace-all format.headers \
225
"Header1: B. E. Cipient <rcipient@example.com>" &&
226
- git format-patch --no-add-headers --stdout master..side |
226
+ git format-patch --no-add-header --stdout master..side |
227
sed -e "/^\$/q" >patch13 &&
228
check_patch patch13 &&
229
! grep "^Header1: B. E. Cipient <rcipient@example.com>\$" patch13