Merge branch 'sb/line-log-plug-pairdiff-leak'

diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh
index 15beecc3c6391fea89ffd5f0b6a091f19f9fce19..0f792689174efda55f041b1c6b2aa14f95860772 100755 (executable)
--- 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