Re: "git push" says "src refspec XYZ matches more than one" even without explicit XYZ argument.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 28, 2016, 19:13 UTC
- Message-ID
- <xmqq1sz01e41.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <CAM7aVoUOxx6Fa+yG2JzQhoX-mE4Lgp9ejvwncx5bdL+1tuQQFg@mail.gmail.com>
Kannan Goundan <kannan@cakoose.com> writes:
Show 17 quoted lines
> 1. My repo has a branch named 'v1' that is tracking 'origin/v1'. > 2. My repo has a tag named 'v1'. > 3. I have "push.default" set to "upstream". > > I made a commit on branch 'v1' and tried doing a push: > > # git push > error: src refspec v1 matches more than one. > error: failed to push some refs to 'git@github.com:whatever/ns1-go.git' > > If I rename the branch to 'v1-dev', then the push goes through. > > I understand why the command "git push origin/v1 v1" is ambiguous. > But if I do a plain "git push", I thought Git would know to push my > current branch. > > [Git version 2.10.1 from Homebrew on Mac OS 10.11.6.]
Thanks.
You are right that the refspec Git internally create for this case should not be v1:refs/heads/v1, which would notice that the source side (e.g. "v1") is ambiguous. Instead we should spell that out.
Perhaps something like this would fix it for you?
builtin/push.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/push.c b/builtin/push.c index 3bb9d6b7e6..02fd235742 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -194,7 +194,7 @@ static void setup_push_upstream(struct remote *remote, struct branch *branch, die_push_simple(branch, remote); } - strbuf_addf(&refspec, "%s:%s", branch->name, branch->merge[0]->src); + strbuf_addf(&refspec, "%s:%s", branch->refname, branch->merge[0]->src); add_refspec(refspec.buf); }