@matheusbsbs / matheus-bagliano / commits / eef2bdaa4a

push: do not use potentially ambiguous default refspec

When the user does the lazy "git push" with no parameters with push.default set to either "upstream", "simple" or "current", we internally generated a refspec that has the current branch name on the source side and used it to push. However, the branch name (say "test") may be an ambiguous refname in the context of the source repository---there may be a tag with the same name, for example. This would trigger an unnecessary error without any fault on the end-user's side. Be explicit and give a full refname as the source side to avoid the ambiguity. The destination side when pushing with the "current" sent only the name of the branch and forcing the receiving end to guess, which is the same issue. Be explicit there as well. Reported-by: Kannan Goundan <kannan@cakoose.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Oct 28, 2016 at 12:25 UTC eef2bdaa4a979994a22dbc5c2e7c5b8a9d2a2043

1 file changed +5 -2

builtin/push.c

+5 -2

@@ -194,15 +194,18 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch,

194 die_push_simple(branch, remote);

195 }

196

197 - strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src);

197 + strbuf_addf(&refspec, "%s:%s", branch->refname, branch->merge[0]->src);

198 add_refspec(refspec.buf);

199 }

200

201 static void setup_push_current(struct remote *remote, struct branch *branch)

202 {

203 + struct strbuf refspec = STRBUF_INIT;

204 +

205 if (!branch)

206 die(_(message_detached_head_die), remote->name);

205 - add_refspec(branch->name);

207 + strbuf_addf(&refspec, "%s:%s", branch->refname, branch->refname);

208 + add_refspec(refspec.buf);

209 }

210

211 static int is_workflow_triangular(struct remote *remote)