git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
	Thomas Rast <trast@inf.ethz.ch>, Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH v3 11/11] t6050-replace: use some long option names
Date: Sat, 31 Aug 2013 21:12:14 +0200	[thread overview]
Message-ID: <20130831191215.26699.76207.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20130831190528.26699.33964.chriscool@tuxfamily.org>

So that they are tested a litlle bit too.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 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 0b07a0b..5dc26e8 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)"
 '
 
@@ -278,7 +278,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 2>err &&
-	git replace -f HEAD^{tree} HEAD~1 2>err &&
+	git replace --force HEAD^{tree} HEAD~1 2>err &&
 	git replace -f HEAD^ $BLOB 2>err
 '
 
-- 
1.8.4.rc1.31.g530f5ce.dirty

  parent reply	other threads:[~2013-08-31 19:14 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-31 19:12 [PATCH v3 00/11] Check replacement object type and minor updates Christian Couder
2013-08-31 19:12 ` [PATCH v3 01/11] replace: forbid replacing an object with one of a different type Christian Couder
2013-08-31 22:11   ` Philip Oakley
2013-09-01 11:53     ` Christian Couder
2013-09-01 19:26       ` Philip Oakley
2013-08-31 19:12 ` [PATCH v3 02/11] Documentation/replace: state that objects must be of the same type Christian Couder
2013-08-31 19:12 ` [PATCH v3 03/11] t6050-replace: test that objects are " Christian Couder
2013-08-31 19:12 ` [PATCH v3 04/11] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-08-31 19:12 ` [PATCH v3 05/11] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-08-31 22:19   ` Philip Oakley
2013-09-01 10:27     ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 06/11] replace: bypass the type check if -f option is used Christian Couder
2013-08-31 19:12 ` [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check Christian Couder
2013-08-31 22:16   ` Philip Oakley
2013-09-01 11:49     ` Christian Couder
2013-09-01 20:11       ` Philip Oakley
2013-09-02  6:11         ` Christian Couder
2013-09-02 21:50           ` Philip Oakley
2013-09-02 21:55             ` Jonathan Nieder
2013-09-02 22:13               ` Philip Oakley
2013-09-02 22:26                 ` Jonathan Nieder
2013-09-02 22:45                   ` Philip Oakley
2013-09-03  9:29             ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 08/11] t6050-replace: check " Christian Couder
2013-09-01  7:50   ` Eric Sunshine
2013-09-01 10:02     ` Christian Couder
2013-08-31 19:12 ` [PATCH v3 09/11] replace: allow long option names Christian Couder
2013-08-31 19:12 ` [PATCH v3 10/11] Documentation/replace: list " Christian Couder
2013-08-31 19:12 ` Christian Couder [this message]
2013-08-31 22:19   ` [PATCH v3 11/11] t6050-replace: use some " Philip Oakley
2013-09-01 10:11     ` Christian Couder
2013-09-01  8:07   ` Eric Sunshine
2013-09-01 10:01     ` Christian Couder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130831191215.26699.76207.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=philipoakley@iee.org \
    --cc=trast@inf.ethz.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).