Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 91ea69631472d9a13184a58a41a55277746b1498..405b97119175a1c0fa75a9db30c6b1ab076cc44e 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -47,4 +47,9 @@ EOF
 
 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