undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-push-config' into maint

Browse Source 
* jk/maint-push-config:
  push: always load default config
This commit is contained in:
Junio C Hamano 2009-11-15 23:07:17 -08:00
commit 8d324bf890
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-push.c
View File

@ -66,7 +66,6 @@ static void setup_push_tracking(void)
static void setup_default_push_refspecs(void) static void setup_default_push_refspecs(void)
{ {
git_config(git_default_config, NULL);
switch (push_default) { switch (push_default) {
default: default:
case PUSH_DEFAULT_MATCHING: case PUSH_DEFAULT_MATCHING:
@ -173,7 +172,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
int tags = 0; int tags = 0;
int rc; int rc;
const char *repo = NULL; /* default repository */ const char *repo = NULL; /* default repository */
struct option options[] = { struct option options[] = {
OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET), OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET),
OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE), OPT_BIT('v', "verbose", &flags, "be verbose", TRANSPORT_PUSH_VERBOSE),
@ -191,6 +189,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
OPT_END() OPT_END()
}; };
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, options, push_usage, 0); argc = parse_options(argc, argv, prefix, options, push_usage, 0);
if (tags) if (tags)