Skip to content

Commit 688f4f2

Browse files
trastgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2fdb5c6 commit 688f4f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t4014-format-patch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ test_expect_success '--no-cc overrides config.cc' '
219219
! grep "^Cc: C. E. Cipient <[email protected]>\$" patch12
220220
'
221221

222-
test_expect_failure '--no-add-headers overrides config.headers' '
222+
test_expect_success '--no-add-header overrides config.headers' '
223223
224224
git config --replace-all format.headers \
225225
"Header1: B. E. Cipient <[email protected]>" &&
226-
git format-patch --no-add-headers --stdout master..side |
226+
git format-patch --no-add-header --stdout master..side |
227227
sed -e "/^\$/q" >patch13 &&
228228
check_patch patch13 &&
229229
! grep "^Header1: B. E. Cipient <[email protected]>\$" patch13

0 commit comments

Comments
 (0)