From: Thomas Rast Date: Mon, 29 Aug 2011 20:10:48 GMT Subject: [PATCH 3/4] t4014: "no-add-headers" is actually called "no-add-header" Message-ID: <221564762d013a422c36f42401c5782a7b20aa17.1314648438.git.trast@student.ethz.ch> In-Reply-To: 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 --- 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 a45d4fb..5cbc066 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 \$" 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 " && - 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 \$" patch13 -- 1.7.7.rc0.370.gdcae57