sha1_file.c: learn about index version 2

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index e98786de32ca3139b2587fd5fca29a9f400c81d7..08e035220cfd5c2da0798eba84c779981f185b4a 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -21,7 +21,7 @@ test_expect_success \
 
 test_expect_success \
        'git-add: Test that executable bit is not used if core.filemode=0' \
-       'git repo-config core.filemode 0 &&
+       'git config core.filemode 0 &&
         echo foo >xfoo1 &&
         chmod 755 xfoo1 &&
         git-add xfoo1 &&
@@ -30,9 +30,19 @@ test_expect_success \
         *) echo fail; git-ls-files --stage xfoo1; (exit 1);;
         esac'
 
+test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
+       rm -f xfoo1 &&
+       ln -s foo xfoo1 &&
+       git-add xfoo1 &&
+       case "`git-ls-files --stage xfoo1`" in
+       120000" "*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 &&
+       'git config core.filemode 0 &&
         echo foo >xfoo2 &&
         chmod 755 xfoo2 &&
         git-update-index --add xfoo2 &&
@@ -41,9 +51,19 @@ test_expect_success \
         *) echo fail; git-ls-files --stage xfoo2; (exit 1);;
         esac'
 
+test_expect_success 'git-add: filemode=0 should not get confused by symlink' '
+       rm -f xfoo2 &&
+       ln -s foo xfoo2 &&
+       git update-index --add xfoo2 &&
+       case "`git-ls-files --stage xfoo2`" in
+       120000" "*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 &&
+       'git config core.filemode 0 &&
         ln -s xfoo2 xfoo3 &&
         git-update-index --add xfoo3 &&
         case "`git-ls-files --stage xfoo3`" in