diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:11:07 -0800 |
| commit | af04b1171b9ed16f5acce0a49fe3bda518a40b7e (patch) | |
| tree | f86d78c39008512fa399fbf20157ffac13d53190 /t | |
| parent | Merge branch 'jt/mailinfo-fold-in-body-headers' into maint (diff) | |
| parent | push: test pushing ambiguously named branches (diff) | |
| download | tgif-af04b1171b9ed16f5acce0a49fe3bda518a40b7e.tar.xz | |
Merge branch 'jc/push-default-explicit' into maint
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-x | t/t5528-push-default.sh | 10 |
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 && |