t/t5515-fetch-merge-logic.sh: Add two more tests

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index c20e4c29fcc864dff80e5ae73a8ad7ede1f794f0..08e035220cfd5c2da0798eba84c779981f185b4a 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -21,24 +21,87 @@ 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 &&
         case "`git-ls-files --stage xfoo1`" in
         100644" "*xfoo1) echo ok;;
-        *) echo fail; git-ls-files --stage xfoo1; exit 1;;
+        *) 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 &&
         case "`git-ls-files --stage xfoo2`" in
         100644" "*xfoo2) echo ok;;
-        *) echo fail; git-ls-files --stage xfoo2; exit 1;;
+        *) 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 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_expect_success '.gitignore test setup' '
+       echo "*.ig" >.gitignore &&
+       mkdir c.if d.ig &&
+       >a.ig && >b.if &&
+       >c.if/c.if && >c.if/c.ig &&
+       >d.ig/d.if && >d.ig/d.ig
+'
+
+test_expect_success '.gitignore is honored' '
+       git-add . &&
+       ! git-ls-files | grep "\\.ig"
+'
+
+test_expect_success 'error out when attempting to add ignored ones without -f' '
+       ! git-add a.?? &&
+       ! git-ls-files | grep "\\.ig"
+'
+
+test_expect_success 'error out when attempting to add ignored ones without -f' '
+       ! git-add d.?? &&
+       ! git-ls-files | grep "\\.ig"
+'
+
+test_expect_success 'add ignored ones with -f' '
+       git-add -f a.?? &&
+       git-ls-files --error-unmatch a.ig
+'
+
+test_expect_success 'add ignored ones with -f' '
+       git-add -f d.??/* &&
+       git-ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+'
+
 test_done