From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v5 7/7] t6050-replace: use some long option names Date: Fri, 06 Sep 2013 07:10:59 +0200 Message-ID: <20130906051100.6657.36477.chriscool@tuxfamily.org> References: <20130906050702.6657.25651.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Philip Oakley , Thomas Rast , Johannes Sixt , Eric Sunshine , Jonathan Nieder To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Sep 06 07:12:14 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VHoL4-0005Eb-AV for gcvg-git-2@plane.gmane.org; Fri, 06 Sep 2013 07:12:10 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750789Ab3IFFMF (ORCPT ); Fri, 6 Sep 2013 01:12:05 -0400 Received: from mail-2y.bbox.fr ([194.158.98.15]:48957 "EHLO mail-2y.bbox.fr" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750733Ab3IFFL5 (ORCPT ); Fri, 6 Sep 2013 01:11:57 -0400 Received: from [127.0.1.1] (cha92-h01-128-78-31-246.dsl.sta.abo.bbox.fr [128.78.31.246]) by mail-2y.bbox.fr (Postfix) with ESMTP id 79D2E50; Fri, 6 Sep 2013 07:11:36 +0200 (CEST) X-git-sha1: e2684afecd489eeb7942de9f7c417021a3034ef2 X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20130906050702.6657.25651.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: So that they are tested a little bit too. Signed-off-by: Christian Couder --- t/t6050-replace.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 09a2b49..7d47984 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -122,9 +122,9 @@ test_expect_success '"git replace" listing and deleting' ' test "$HASH2" = "$(git replace -l)" && test "$HASH2" = "$(git replace)" && aa=${HASH2%??????????????????????????????????????} && - test "$HASH2" = "$(git replace -l "$aa*")" && + test "$HASH2" = "$(git replace --list "$aa*")" && test_must_fail git replace -d $R && - test_must_fail git replace -d && + test_must_fail git replace --delete && test_must_fail git replace -l -d $HASH2 && git replace -d $HASH2 && git show $HASH2 | grep "A U Thor" && @@ -147,7 +147,7 @@ test_expect_success '"git replace" resolves sha1' ' git show $HASH2 | grep "O Thor" && test_must_fail git replace $HASH2 $R && git replace -f $HASH2 $R && - test_must_fail git replace -f && + test_must_fail git replace --force && test "$HASH2" = "$(git replace)" ' @@ -272,7 +272,7 @@ test_expect_success 'replaced and replacement objects must be of the same type' test_expect_success '-f option bypasses the type check' ' git replace -f mytag $HASH1 && - git replace -f HEAD^{tree} HEAD~1 && + git replace --force HEAD^{tree} HEAD~1 && git replace -f HEAD^ $BLOB ' -- 1.8.4.rc1.28.ge2684af