Merge branch 'sb/commit-tree-minileak'

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 3111baa9e38ecf96de6385dc9241ea8c992e4992..943dd57aacd379868687637fc9b2770b6ebc46d8 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -335,6 +335,17 @@ test_expect_success \
     git checkout -b delete-me master &&
     rm .git/refs/heads/delete-me &&
     test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-    !(git checkout --track -b track)'
+    test_must_fail git checkout --track -b track'
+
+test_expect_success \
+    'checkout with --track fakes a sensible -b <name>' '
+    git update-ref refs/remotes/origin/koala/bear renamer &&
+    git checkout --track origin/koala/bear &&
+    test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
+    test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"'
+
+test_expect_success \
+    'checkout with --track, but without -b, fails with too short tracked name' '
+    test_must_fail git checkout --track renamer'
 
 test_done