summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-27 08:11:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-27 08:11:40 (GMT)
commit6c18dd4dc370284417938a252ba7f1a36ad51053 (patch)
treec59a2ad8ff56e6fca6ce1c8984273c7e4ae7532e /builtin/push.c
parent1d1bdafd64266e5ee3bd46c6965228f32e4022ea (diff)
parentb284495e93394394f7c7923f6d646947844cec04 (diff)
downloadgit-6c18dd4dc370284417938a252ba7f1a36ad51053.zip
git-6c18dd4dc370284417938a252ba7f1a36ad51053.tar.gz
git-6c18dd4dc370284417938a252ba7f1a36ad51053.tar.bz2
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/push.c')
-rw-r--r--builtin/push.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 3bb9d6b..9307ad5 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)