Merge branch 'master' into js/merge

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 71c454356fbbcd5f67bdfc0b6ef7785fa8b712c1..ed37141b6e5afd8294c5961a1ab96c634a5f4a82 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -73,6 +73,7 @@ test_expect_success setup '
        for i in 1 2; do echo $i; done >>dir/sub &&
        git update-index file0 dir/sub &&
 
+       git repo-config log.showroot false &&
        git commit --amend &&
        git show-branch
 '