From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Rast Subject: [PATCH 3/4] t4014: "no-add-headers" is actually called "no-add-header" Date: Mon, 29 Aug 2011 22:10:48 +0200 Message-ID: <221564762d013a422c36f42401c5782a7b20aa17.1314648438.git.trast@student.ethz.ch> References: Mime-Version: 1.0 Content-Type: text/plain Cc: Stephen Boyd , Junio C Hamano To: X-From: git-owner@vger.kernel.org Mon Aug 29 22:10:59 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qy8Ab-0005R6-JI for gcvg-git-2@lo.gmane.org; Mon, 29 Aug 2011 22:10:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754990Ab1H2UKx (ORCPT ); Mon, 29 Aug 2011 16:10:53 -0400 Received: from edge20.ethz.ch ([82.130.99.26]:55607 "EHLO edge20.ethz.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754885Ab1H2UKw (ORCPT ); Mon, 29 Aug 2011 16:10:52 -0400 Received: from CAS10.d.ethz.ch (172.31.38.210) by edge20.ethz.ch (82.130.99.26) with Microsoft SMTP Server (TLS) id 14.1.289.1; Mon, 29 Aug 2011 22:10:49 +0200 Received: from localhost.localdomain (129.132.153.219) by cas10.d.ethz.ch (172.31.38.210) with Microsoft SMTP Server (TLS) id 14.1.289.1; Mon, 29 Aug 2011 22:10:50 +0200 X-Mailer: git-send-email 1.7.7.rc0.370.gdcae57 In-Reply-To: X-Originating-IP: [129.132.153.219] Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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