summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kaarsemaker <dennis@kaarsemaker.net>2016-10-31 21:38:35 +0100
committerJunio C Hamano <gitster@pobox.com>2016-10-31 14:11:22 -0700
commitb284495e93394394f7c7923f6d646947844cec04 (patch)
tree7cd2e2755099bad4a9269b8eb20854c4f40f0db5
parenteef2bdaa4a979994a22dbc5c2e7c5b8a9d2a2043 (diff)
downloadgit-jc/push-default-explicit.tar.gz
push: test pushing ambiguously named branchesjc/push-default-explicit
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5528-push-default.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index 73f4bb6346..44309566f1 100755
--- 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 &&