checkout -m path: fix recreating conflicts

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 6d12efb74d8bedede8e476429b2fccd648eb05a3..405b97119175a1c0fa75a9db30c6b1ab076cc44e 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -45,6 +45,11 @@ A U Thor (5):
 
 EOF
 
-test_expect_success 'shortlog wrapping' 'diff -u expect out'
+test_expect_success 'shortlog wrapping' 'test_cmp expect out'
+
+git log HEAD > log
+GIT_DIR=non-existing git shortlog -w < log > out
+
+test_expect_success 'shortlog from non-git directory' 'test_cmp expect out'
 
 test_done