Skip to content

Commit b1ecd8c

Browse files
chriscoolgitster
authored andcommitted
t6050-replace: use some long option names
So that they are tested a little bit too. Signed-off-by: Christian Couder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ed0ff80 commit b1ecd8c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t6050-replace.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ test_expect_success '"git replace" listing and deleting' '
122122
test "$HASH2" = "$(git replace -l)" &&
123123
test "$HASH2" = "$(git replace)" &&
124124
aa=${HASH2%??????????????????????????????????????} &&
125-
test "$HASH2" = "$(git replace -l "$aa*")" &&
125+
test "$HASH2" = "$(git replace --list "$aa*")" &&
126126
test_must_fail git replace -d $R &&
127-
test_must_fail git replace -d &&
127+
test_must_fail git replace --delete &&
128128
test_must_fail git replace -l -d $HASH2 &&
129129
git replace -d $HASH2 &&
130130
git show $HASH2 | grep "A U Thor" &&
@@ -147,7 +147,7 @@ test_expect_success '"git replace" resolves sha1' '
147147
git show $HASH2 | grep "O Thor" &&
148148
test_must_fail git replace $HASH2 $R &&
149149
git replace -f $HASH2 $R &&
150-
test_must_fail git replace -f &&
150+
test_must_fail git replace --force &&
151151
test "$HASH2" = "$(git replace)"
152152
'
153153

@@ -272,7 +272,7 @@ test_expect_success 'replaced and replacement objects must be of the same type'
272272

273273
test_expect_success '-f option bypasses the type check' '
274274
git replace -f mytag $HASH1 &&
275-
git replace -f HEAD^{tree} HEAD~1 &&
275+
git replace --force HEAD^{tree} HEAD~1 &&
276276
git replace -f HEAD^ $BLOB
277277
'
278278

0 commit comments

Comments
 (0)