From: Dennis Kaarsemaker <dennis@kaarsemaker.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Kannan Goundan <kannan@cakoose.com>
Subject: Re: [PATCH] push: do not use potentially ambiguous default refspec
Date: Mon, 31 Oct 2016 21:38:35 +0100 [thread overview]
Message-ID: <20161031203834.dfavyjzkob2goa5n@hurricane> (raw)
In-Reply-To: <xmqqvawcz36d.fsf@gitster.mtv.corp.google.com>
On Fri, Oct 28, 2016 at 12:25:30PM -0700, Junio C Hamano wrote:
> * It is appreciated if somebody with spare cycles can add a test or
> two for this in t/t5523-push-upstream.sh or somewhere nearby.
5523 is for push --set-upstream-to, 5528 seemed more appropriate. Here's
something squashable that fails before your patch and succeeds after.
>8----
Subject: [PATCH] push: test pushing ambiguously named branches
Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net>
---
t/t5528-push-default.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index 73f4bb6..ac103ce 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 &&
--
2.10.1-449-gab0f84c
next prev parent reply other threads:[~2016-10-31 20:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 19:25 [PATCH] push: do not use potentially ambiguous default refspec Junio C Hamano
2016-10-31 20:38 ` Dennis Kaarsemaker [this message]
2016-10-31 21:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031203834.dfavyjzkob2goa5n@hurricane \
--to=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kannan@cakoose.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.