Make sure the empty tree exists when needed in merge-recursive.

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 6cd05c3d9096e8017a6bfb23982ea46e0ae93630..c09c53f20bbc04f36d26ff37f060f42233a1c0db 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -19,4 +19,36 @@ test_expect_success \
     'Test that "git-add -- -q" works' \
     'touch -- -q && git-add -- -q'
 
+test_expect_success \
+       'git-add: Test that executable bit is not used if core.filemode=0' \
+       'git repo-config core.filemode 0 &&
+        echo foo >xfoo1 &&
+        chmod 755 xfoo1 &&
+        git-add xfoo1 &&
+        case "`git-ls-files --stage xfoo1`" in
+        100644" "*xfoo1) echo ok;;
+        *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
+        esac'
+
+test_expect_success \
+       'git-update-index --add: Test that executable bit is not used...' \
+       'git repo-config core.filemode 0 &&
+        echo foo >xfoo2 &&
+        chmod 755 xfoo2 &&
+        git-update-index --add xfoo2 &&
+        case "`git-ls-files --stage xfoo2`" in
+        100644" "*xfoo2) echo ok;;
+        *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
+        esac'
+
+test_expect_success \
+       'git-update-index --add: Test that executable bit is not used...' \
+       'git repo-config core.filemode 0 &&
+        ln -s xfoo2 xfoo3 &&
+        git-update-index --add xfoo3 &&
+        case "`git-ls-files --stage xfoo3`" in
+        120000" "*xfoo3) echo ok;;
+        *) echo fail; git-ls-files --stage xfoo3; (exit 1);;
+        esac'
+
 test_done