diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2013-09-06 07:10:59 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-09-06 13:32:34 -0700 |
| commit | b1ecd8cfdfc46bcb3d2c06cf0dbaf6d1ebe41e3c (patch) | |
| tree | 015fe69a09861a7590f02893c5f5d49b4d40d88c | |
| parent | replace: allow long option names (diff) | |
| download | tgif-b1ecd8cfdfc46bcb3d2c06cf0dbaf6d1ebe41e3c.tar.xz | |
t6050-replace: use some long option names
So that they are tested a little bit too.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t6050-replace.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 09a2b49bfb..7d47984352 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 ' |