diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-22 00:44:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-22 00:44:09 -0700 |
| commit | d1f6c18bd6ea5fd373f9f6356e02854678ffa0fd (patch) | |
| tree | 41b6b3d3fb71765f6e6223e35873edaaffb9bff5 | |
| parent | cff4231a1dfbe68b4a163b31406d862567d3243a (diff) | |
| parent | ed342fdea0b7fd466ed3257c5e68aa81c391b782 (diff) | |
| download | git-d1f6c18bd6ea5fd373f9f6356e02854678ffa0fd.tar.gz git-d1f6c18bd6ea5fd373f9f6356e02854678ffa0fd.tar.xz | |
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
| -rw-r--r-- | builtin-add.c | 4 | ||||
| -rwxr-xr-x | t/t3700-add.sh | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c index ad889aac5..d6ad57bfc 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -250,6 +250,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) int add_new_files; int require_pathspec; + git_config(add_config, NULL); + argc = parse_options(argc, argv, builtin_add_options, builtin_add_usage, 0); if (patch_interactive) @@ -257,8 +259,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) 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 || take_worktree_changes) && !argc) { diff --git a/t/t3700-add.sh b/t/t3700-add.sh index 050de42ef..32595fa30 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 && |