mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/maint-1.6.0-add-config-fix' into maint

Browse Source 
* sb/maint-1.6.0-add-config-fix:
  add: allow configurations to be overriden by command line
This commit is contained in:
Junio C Hamano
2009-06-22 00:44:09 -07:00
parent cff4231a1d ed342fdea0
commit d1f6c18bd6
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-add.c
View File

@ -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) {