Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
push: test pushing ambiguously named branches
author
Dennis Kaarsemaker
<dennis@kaarsemaker.net>
Mon, 31 Oct 2016 20:38:35 +0000
(21:38 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Oct 2016 21:11:22 +0000
(14:11 -0700)
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5528-push-default.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
eef2bda
)
diff --git
a/t/t5528-push-default.sh
b/t/t5528-push-default.sh
index 73f4bb63465e50aa12de824859903e5293696a85..44309566f13431fe5e70f834b4cd6bb0a674624e 100755
(executable)
--- 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_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 &&
test_expect_success 'push from/to new branch with current creates remote branch' '
test_config branch.new-branch.remote repo1 &&
git checkout new-branch &&