diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 23:07:17 -0800 |
| commit | 8d324bf89057a28fda08cc4c8d37ce98a79cf9be (patch) | |
| tree | 8bedcf2b479cf05f5f203bbb9183d0af7be40a6b | |
| parent | 061c4d0829df96d00d3972748d4325631e5fb432 (diff) | |
| parent | 2aae905f23f79f004625346d057e5be7a81dbcd4 (diff) | |
| download | git-8d324bf89057a28fda08cc4c8d37ce98a79cf9be.tar.gz git-8d324bf89057a28fda08cc4c8d37ce98a79cf9be.tar.xz | |
Merge branch 'jk/maint-push-config' into maint
* jk/maint-push-config:
push: always load default config
| -rw-r--r-- | builtin-push.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-push.c b/builtin-push.c index 8631c06ed..752121f24 100644 --- a/builtin-push.c +++ b/builtin-push.c @@ -66,7 +66,6 @@ static void setup_push_tracking(void) static void setup_default_push_refspecs(void) { - git_config(git_default_config, NULL); switch (push_default) { default: case PUSH_DEFAULT_MATCHING: @@ -173,7 +172,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) int tags = 0; int rc; const char *repo = NULL; /* default repository */ - struct option options[] = { OPT_BIT('q', "quiet", &flags, "be quiet", TRANSPORT_PUSH_QUIET), 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() }; + git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, options, push_usage, 0); if (tags) |