summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-29 19:01:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-29 19:01:31 (GMT)
commit4d06f8ac4389ed8bcd2d03b2dcab4b7e2a858402 (patch)
tree4e3a5a96d5a74f7d9e3e93f7489b8a51fb2da779 /t
parentc889763bf33e9b54843dc93ba3bb38803f86a6cf (diff)
downloadgit-4d06f8ac4389ed8bcd2d03b2dcab4b7e2a858402.zip
git-4d06f8ac4389ed8bcd2d03b2dcab4b7e2a858402.tar.gz
git-4d06f8ac4389ed8bcd2d03b2dcab4b7e2a858402.tar.bz2
Fix 'git add' with .gitignore
When '*.ig' is ignored, and you have two files f.ig and d.ig/foo in the working tree, $ git add . correctly ignored f.ig but failed to ignore d.ig/foo. This was caused by a thinko in an earlier commit 4888c534, when we tried to allow adding otherwise ignored files. After reverting that commit, this takes a much simpler approach. When we have an unmatched pathspec that talks about an existing pathname, we know it is an ignored path the user tried to add, so we include it in the set of paths directory walker returned. This does not let you say "git add -f D" on an ignored directory D and add everything under D. People can submit a patch to further allow it if they want to, but I think it is a saner behaviour to require explicit paths to be spelled out in such a case. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t3700-add.sh33
1 files changed, 33 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index c09c53f..e98786d 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -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