diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:31:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:31:42 -0800 |
| commit | 7b2ac7ee9ec19b8f9302a776b7274faee66e9b64 (patch) | |
| tree | f6a567c0c0d5e89aceb8d223d39172eabd937bb4 /builtin-push.c | |
| parent | af526de90ca1ae1baf039f161cf9597d3ef379d4 (diff) | |
| parent | 2aae905f23f79f004625346d057e5be7a81dbcd4 (diff) | |
| download | git-7b2ac7ee9ec19b8f9302a776b7274faee66e9b64.tar.gz | |
Merge branch 'jk/maint-push-config'
* jk/maint-push-config:
push: always load default config
Diffstat (limited to 'builtin-push.c')
| -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 8631c06ed6..752121f247 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) |