summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-27 00:11:40 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-27 00:11:40 -0800
commit6c18dd4dc370284417938a252ba7f1a36ad51053 (patch)
treec59a2ad8ff56e6fca6ce1c8984273c7e4ae7532e /t
parentThird batch for 2.12 (diff)
parentpush: test pushing ambiguously named branches (diff)
downloadtgif-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 't')
-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 &&