Skip to content

Commit

Permalink
Merge branch 'jk/maint-push-config' into maint
Browse files Browse the repository at this point in the history
* jk/maint-push-config:
  push: always load default config
  • Loading branch information
Junio C Hamano committed Nov 16, 2009
2 parents 061c4d0 + 2aae905 commit 8d324bf
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions builtin-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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),
Expand All @@ -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)
Expand Down

0 comments on commit 8d324bf

Please sign in to comment.