Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index c09c53f20bbc04f36d26ff37f060f42233a1c0db..caaab26c2f3f2d04581a6c6918ab36f97a51f975 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 &&
@@ -32,7 +32,7 @@ test_expect_success \
 
 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 &&
@@ -43,7 +43,7 @@ test_expect_success \
 
 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
@@ -51,4 +51,37 @@ test_expect_success \
         *) 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