Merge branch 'pb/autocorrect-wrapper'

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 25181388f8a8f1730d05fce128e0e1fc66eb3c0e..62d73f934a0c0be2d41a30d11308430838f6c9c0 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -391,4 +391,14 @@ test_expect_success 'checkout an unmerged path should fail' '
        test_cmp sample file
 '
 
+test_expect_success 'failing checkout -b should not break working tree' '
+       git reset --hard master &&
+       git symbolic-ref HEAD refs/heads/master &&
+       test_must_fail git checkout -b renamer side^ &&
+       test $(git symbolic-ref HEAD) = refs/heads/master &&
+       git diff --exit-code &&
+       git diff --cached --exit-code
+
+'
+
 test_done