summaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6032-merge-large-rename.sh')
-rwxr-xr-xt/t6032-merge-large-rename.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh
index 15beecc3c6..0f79268917 100755
--- a/t/t6032-merge-large-rename.sh
+++ b/t/t6032-merge-large-rename.sh
@@ -28,10 +28,10 @@ make_text() {
test_rename() {
test_expect_success "rename ($1, $2)" '
- n='$1'
- expect='$2'
+ n='$1' &&
+ expect='$2' &&
git checkout -f master &&
- git branch -D test$n || true &&
+ test_might_fail git branch -D test$n &&
git reset --hard initial &&
for i in $(count $n); do
make_text $i initial initial >$i