diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:46:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 21:46:38 -0700 |
| commit | 09236d80480c15f6da804e56a80c08d320475fb1 (patch) | |
| tree | fcffb58dc5dc9ae53e93f4f28357f8a15cb43da4 /t/t3700-add.sh | |
| parent | Merge branch 'lt/maint-unsigned-left-shift' (diff) | |
| parent | add: allow configurations to be overriden by command line (diff) | |
| download | tgif-09236d80480c15f6da804e56a80c08d320475fb1.tar.xz | |
Merge branch 'sb/maint-1.6.0-add-config-fix'
* sb/maint-1.6.0-add-config-fix:
add: allow configurations to be overriden by command line
use xstrdup, not strdup in ll-merge.c
Conflicts:
builtin-add.c
Diffstat (limited to 't/t3700-add.sh')
| -rwxr-xr-x | t/t3700-add.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 6ce8256a17..6ae5a2cd95 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -221,6 +221,19 @@ test_expect_success POSIXPERM 'git add (add.ignore-errors = false)' ' test_must_fail git add --verbose . && ! ( git ls-files foo1 | grep foo1 ) ' +rm -f foo2 + +test_expect_success '--no-ignore-errors overrides config' ' + git config add.ignore-errors 1 && + git reset --hard && + date >foo1 && + date >foo2 && + chmod 0 foo2 && + test_must_fail git add --verbose --no-ignore-errors . && + ! ( git ls-files foo1 | grep foo1 ) && + git config add.ignore-errors 0 +' +rm -f foo2 test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" ' git reset --hard && |