From: Junio C Hamano Date: Mon, 22 Jun 2009 07:44:09 +0000 (-0700) Subject: Merge branch 'sb/maint-1.6.0-add-config-fix' into maint X-Git-Tag: v1.6.4-rc0~10^2~14 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1f6c18bd6ea5fd373f9f6356e02854678ffa0fd;p=git.git Merge branch 'sb/maint-1.6.0-add-config-fix' into maint * sb/maint-1.6.0-add-config-fix: add: allow configurations to be overriden by command line --- d1f6c18bd6ea5fd373f9f6356e02854678ffa0fd diff --cc builtin-add.c index ad889aac5,13db4a645..d6ad57bfc --- a/builtin-add.c +++ b/builtin-add.c @@@ -257,11 -256,9 +259,9 @@@ int cmd_add(int argc, const char **argv if (add_interactive) exit(interactive_add(argc, argv, prefix)); - git_config(add_config, NULL); - if (addremove && take_worktree_changes) die("-A and -u are mutually incompatible"); - if (addremove && !argc) { + if ((addremove || take_worktree_changes) && !argc) { static const char *here[2] = { ".", NULL }; argc = 1; argv = here; diff --cc t/t3700-add.sh index 050de42ef,060a6ecab..32595fa30 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@@ -221,8 -221,21 +221,21 @@@ test_expect_success POSIXPERM 'git add 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 'git add '\''fo\[ou\]bar'\'' ignores foobar' ' +test_expect_success BSLASHPSPEC "git add 'fo\\[ou\\]bar' ignores foobar" ' git reset --hard && touch fo\[ou\]bar foobar && git add '\''fo\[ou\]bar'\'' &&