Merge branch 'jc/push-default-explicit' into maint

gitster · gitster · commit af04b1171b9e · 2017-01-17T15:11:07.000-08:00
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
diff --git 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)
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
@@ -98,6 +98,16 @@ test_expect_success 'push from/to new branch with upstream, matching and simple'
 	test_push_failure upstream
 '
 
+test_expect_success 'push ambiguously named branch with upstream, matching and simple' '
+	git checkout -b ambiguous &&
+	test_config branch.ambiguous.remote parent1 &&
+	test_config branch.ambiguous.merge refs/heads/ambiguous &&
+	git tag ambiguous &&
+	test_push_success simple ambiguous &&
+	test_push_success matching ambiguous &&
+	test_push_success upstream ambiguous
+'
+
 test_expect_success 'push from/to new branch with current creates remote branch' '
 	test_config branch.new-branch.remote repo1 &&
 	git checkout new-branch &&

Original file line number	Diff line number	Diff line change
`@@ -194,15 +194,18 @@ static void setup_push_upstream(struct remote remote, struct branch branch,`
`194`	`194`	`die_push_simple(branch, remote);`
`195`	`195`	`}`
`196`	`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`	`198`	`add_refspec(refspec.buf);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`static void setup_push_current(struct remote remote, struct branch branch)`
`202`	`202`	`{`
	`203`	`+ struct strbuf refspec = STRBUF_INIT;`
	`204`	`+`
`203`	`205`	`if (!branch)`
`204`	`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);`
`206`	`209`	`}`
`207`	`210`
`208`	`211`	`static int is_workflow_triangular(struct remote *remote)`