summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-04 00:23:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-04 23:12:34 (GMT)
commitfc9261ca611080b1dae76b86b3bf5f36d592042f (patch)
treec9ec7196e858e2a55067d02ec1e118c3800f8554 /builtin/push.c
parentca02465b41311fe7634acb9bb5b5c61975ef5f38 (diff)
downloadgit-fc9261ca611080b1dae76b86b3bf5f36d592042f.zip
git-fc9261ca611080b1dae76b86b3bf5f36d592042f.tar.gz
git-fc9261ca611080b1dae76b86b3bf5f36d592042f.tar.bz2
push: also use "upstream" mapping when pushing a single ref
When the user is using the 'upstream' mode, these commands: $ git push $ git push origin would find the 'upstream' branch for the current branch, and then push the current branch to update it. However, pushing a single branch explicitly, i.e. $ git push origin $(git symbolic-ref --short HEAD) would not go through the same ref mapping process, and ends up updating the branch at 'origin' of the same name, which may not necessarily be the upstream of the branch being pushed. In the spirit similar to the previous one, map a colon-less refspec using the upstream mapping logic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 857f76d..9e47c29 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -58,6 +58,17 @@ static const char *map_refspec(const char *ref,
}
}
+ if (push_default == PUSH_DEFAULT_UPSTREAM &&
+ !prefixcmp(matched->name, "refs/heads/")) {
+ struct branch *branch = branch_get(matched->name + 11);
+ if (branch->merge_nr == 1 && branch->merge[0]->src) {
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_addf(&buf, "%s:%s",
+ ref, branch->merge[0]->src);
+ return strbuf_detach(&buf, NULL);
+ }
+ }
+
return ref;
}