aboutsummaryrefslogtreecommitdiffstats
path: root/t/t2204-add-ignored.sh
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xt/t2204-add-ignored.sh17
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 31eb233df5..aa55b219ab 100755
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -89,4 +89,21 @@ do
'
done
+test_expect_success "exclude magic would not interfere with .gitignore" '
+ test_write_lines dir file sub ign err out "*.o" >.gitignore &&
+ >foo.o &&
+ >foo.c &&
+ test_must_fail git add foo.o 2>err &&
+ test_grep "are ignored by one" err &&
+ test_grep "hint: Use -f" err &&
+
+ git add ":(exclude)foo.o" &&
+ git ls-files >actual &&
+ cat >expect <<-\EOF &&
+ .gitignore
+ foo.c
+ EOF
+ test_cmp expect actual
+'
+
test_done