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>
Christian Couder committed
Sep 6, 2013 at 07:10 UTC
b1ecd8cfdfc46bcb3d2c06cf0dbaf6d1ebe41e3c
1 file changed
+4
-4
t/t6050-replace.sh
+4
-4
@@ -122,9 +122,9 @@ test_expect_success '"git replace" listing and deleting' '
122
test "$HASH2" = "$(git replace -l)" &&
123
test "$HASH2" = "$(git replace)" &&
124
aa=${HASH2%??????????????????????????????????????} &&
125
- test "$HASH2" = "$(git replace -l "$aa*")" &&
125
+ test "$HASH2" = "$(git replace --list "$aa*")" &&
126
test_must_fail git replace -d $R &&
127
- test_must_fail git replace -d &&
127
+ test_must_fail git replace --delete &&
128
test_must_fail git replace -l -d $HASH2 &&
129
git replace -d $HASH2 &&
130
git show $HASH2 | grep "A U Thor" &&
@@ -147,7 +147,7 @@ test_expect_success '"git replace" resolves sha1' '
147
git show $HASH2 | grep "O Thor" &&
148
test_must_fail git replace $HASH2 $R &&
149
git replace -f $HASH2 $R &&
150
- test_must_fail git replace -f &&
150
+ test_must_fail git replace --force &&
151
test "$HASH2" = "$(git replace)"
152
'
153
@@ -272,7 +272,7 @@ test_expect_success 'replaced and replacement objects must be of the same type'
272
273
test_expect_success '-f option bypasses the type check' '
274
git replace -f mytag $HASH1 &&
275
- git replace -f HEAD^{tree} HEAD~1 &&
275
+ git replace --force HEAD^{tree} HEAD~1 &&
276
git replace -f HEAD^ $BLOB
277
'
278