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

remote: handle pushremote config in any order

Browse Source 
The remote we push can be defined either by
remote.pushdefault or by branch.*.pushremote for the current
branch. The order in which they appear in the config file
should not matter to precedence (which should be to prefer
the branch-specific config).

The current code parses the config linearly and uses a
single string to store both values, overwriting any
previous value. Thus, config like:

  [branch "master"]
  pushremote = foo
  [remote]
  pushdefault = bar

erroneously ends up pushing to "bar" from the master branch.

We can fix this by storing both values and resolving the
correct value after all config is read.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-02-24 03:59:03 -05:00 committed by Junio C Hamano
parent 7bbc4e8fdb
commit 98b406f3ad
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
remote.c
View File

@ -49,6 +49,7 @@ static int branches_nr;
static struct branch *current_branch; static struct branch *current_branch;
static const char *default_remote_name; static const char *default_remote_name;
static const char *branch_pushremote_name;
static const char *pushremote_name; static const char *pushremote_name;
static int explicit_default_remote_name; static int explicit_default_remote_name;
@ -352,7 +353,7 @@ static int handle_config(const char *key, const char *value, void *cb)
} }
} else if (!strcmp(subkey, ".pushremote")) { } else if (!strcmp(subkey, ".pushremote")) {
if (branch == current_branch) if (branch == current_branch)
if (git_config_string(&pushremote_name, key, value)) if (git_config_string(&branch_pushremote_name, key, value))
return -1; return -1;
} else if (!strcmp(subkey, ".merge")) { } else if (!strcmp(subkey, ".merge")) {
if (!value) if (!value)
@ -492,6 +493,10 @@ static void read_config(void)
make_branch(head_ref + strlen("refs/heads/"), 0); make_branch(head_ref + strlen("refs/heads/"), 0);
} }
git_config(handle_config, NULL); git_config(handle_config, NULL);
if (branch_pushremote_name) {
free((char *)pushremote_name);
pushremote_name = branch_pushremote_name;
}
alias_all_urls(); alias_all_urls();
} }

13
t/t5516-fetch-push.sh
View File

@ -536,6 +536,19 @@ test_expect_success 'push with config branch.*.pushremote' '
check_push_result down_repo $the_commit heads/master check_push_result down_repo $the_commit heads/master
' '
test_expect_success 'branch.*.pushremote config order is irrelevant' '
mk_test one_repo heads/master &&
mk_test two_repo heads/master &&
test_config remote.one.url one_repo &&
test_config remote.two.url two_repo &&
test_config branch.master.pushremote two_repo &&
test_config remote.pushdefault one_repo &&
test_config push.default matching &&
git push &&
check_push_result one_repo $the_first_commit heads/master &&
check_push_result two_repo $the_commit heads/master
'
test_expect_success 'push with dry-run' ' test_expect_success 'push with dry-run' '
mk_test testrepo heads/master && mk_test testrepo heads/master &&