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 /builtin-add.c | |
| parent | 7c74c3926ad60ba1bbfed13355f00a29813a0f32 (diff) | |
| parent | ed342fdea0b7fd466ed3257c5e68aa81c391b782 (diff) | |
| download | git-09236d80480c15f6da804e56a80c08d320475fb1.tar.gz | |
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 '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 c1b229a9d8..56e522127c 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -298,6 +298,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, prefix, builtin_add_options, builtin_add_usage, PARSE_OPT_KEEP_ARGV0); if (patch_interactive) @@ -305,8 +307,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (add_interactive) exit(interactive_add(argc - 1, argv + 1, prefix)); - git_config(add_config, NULL); - if (edit_interactive) return(edit_patch(argc, argv, prefix)); argc--; |