diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-06-18 13:17:54 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-18 23:20:36 +0400 |
| commit | ed342fdea0b7fd466ed3257c5e68aa81c391b782 (patch) | |
| tree | 52da9af7703434bc8cb40c74e7e52e3afa4ef38c /builtin-add.c | |
| parent | 90dce51584e908232ff279a6c2949ea9855dddf3 (diff) | |
add: allow configurations to be overriden by command line
Don't call git_config after parsing the command line options, otherwise
the config settings will override any settings made by the command line.
This can be seen by setting add.ignore_errors and then specifying
--no-ignore-errors when using git-add.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-add.c')
| -rw-r--r-- | builtin-add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c index fc3f96eaef..13db4a6455 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -247,6 +247,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) @@ -254,8 +256,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 && !argc) { |