Re: [PATCH v3 11/11] t6050-replace: use some long option names
From: Philip Oakley <hidden>
Date: 2016-06-15 22:58:35
From: "Christian Couder" <redacted> Subject: [PATCH v3 11/11] t6050-replace: use some long option names
So that they are tested a litlle bit too.
s /litlle/little/
quoted hunk ↗ jump to hunk
Signed-off-by: Christian Couder <redacted> --- 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 anddeleting' ' 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 replacementobjects 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