Merge branch 'jk/format-patch-from' into maint

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 4031693e712f70b5ef7b755b7d9c49e8f7e0c7a1..55c9ab0b6a5c65aacdb3ef6107c3417d7bdc4e00 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -871,7 +871,8 @@ test_expect_success '--merged catches invalid object names' '
        test_must_fail git branch --merged 0000000000000000000000000000000000000000
 '
 
-test_expect_failure 'tracking with unexpected .fetch refspec' '
+test_expect_success 'tracking with unexpected .fetch refspec' '
+       rm -rf a b c d &&
        git init a &&
        (
                cd a &&