Skip to content

Commit

Permalink
t6050-replace: use some long option names
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Sep 6, 2013
1 parent ed0ff80 commit b1ecd8c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions t/t6050-replace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" &&
Expand All @@ -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)"
'

Expand Down Expand Up @@ -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
'

Expand Down

0 comments on commit b1ecd8c

Please sign in to comment.