diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 00:11:40 -0800 |
| commit | 6c18dd4dc370284417938a252ba7f1a36ad51053 (patch) | |
| tree | c59a2ad8ff56e6fca6ce1c8984273c7e4ae7532e /builtin | |
| parent | Third batch for 2.12 (diff) | |
| parent | push: test pushing ambiguously named branches (diff) | |
| download | tgif-6c18dd4dc370284417938a252ba7f1a36ad51053.tar.xz | |
Merge branch 'jc/push-default-explicit'
A lazy "git push" without refspec did not internally use a fully
specified refspec to perform 'current', 'simple', or 'upstream'
push, causing unnecessary "ambiguous ref" errors.
* jc/push-default-explicit:
push: test pushing ambiguously named branches
push: do not use potentially ambiguous default refspec
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c index 3bb9d6b7e6..9307ad56a9 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -194,15 +194,18 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, die_push_simple(branch, remote); } - strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src); + strbuf_addf(&refspec, "%s:%s", branch->refname, branch->merge[0]->src); add_refspec(refspec.buf); } static void setup_push_current(struct remote *remote, struct branch *branch) { + struct strbuf refspec = STRBUF_INIT; + if (!branch) die(_(message_detached_head_die), remote->name); - add_refspec(branch->name); + strbuf_addf(&refspec, "%s:%s", branch->refname, branch->refname); + add_refspec(refspec.buf); } static int is_workflow_triangular(struct remote *remote) |