Merge branch 'ss/pull-rebase-preserve'

diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index f30c03885cda050f0bc704428ffa8a66932ff3fd..4ca48f02761d4379bf5e01cb862e47830ec0c5ac 100755 (executable)
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -139,8 +139,8 @@ EOF
 '
 
 test_expect_success 'new clone fetch master and tags' '
-       git branch -D cat
-       rm -f $U
+       test_might_fail git branch -D cat &&
+       rm -f $U &&
        (
                mkdir clone2 &&
                cd clone2 &&