src refspec matches more than one

[AndrewSav]

If I have two mains on my fork, one is origin and one is upstream, I get a error message in subject when I'm trying to push. Currently I have to drop to command line from lazygit to push. What is a practical way to resolve this?

[mark2185]

Is it a new branch that you're trying to push or is it an already existing one? Does it happen on every push? What do you run in the command line to solve it?

[mark2185]

Could you please post your .gitconfig?

Also just to confirm, the currently checked out branch does have an upstream, i.e. when you press u on it you get something like this? The options aren't crossed out?

[AndrewSav]

This is what I'm seeing pressing 'u' on the master branch. (I used word main in the previous post but the actual branches are called master)

.gitconfig:

[credential]
	helper = manager
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[user]
	name = Andrew Savinykh
	email = [email protected]
[core]
	autocrlf = false
[pull]
	rebase = true
[init]
	defaultBranch = main

Error message on push:

.git\config:

[core]
	repositoryformatversion = 0
	filemode = false
	bare = false
	logallrefupdates = true
	symlinks = false
	ignorecase = true
[remote "origin"]
	url = [email protected]:AndrewSav/csvfix.git
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
[remote "upstream"]
	url = https://github.com/wlbr/csvfix.git
	fetch = +refs/heads/*:refs/remotes/upstream/*

[AndrewSav]

Umh: https://github.com/wlbr/csvfix/tags

Is there anything I can do?
Reference: https://stackoverflow.com/questions/9378760/git-push-local-branch-with-same-name-as-remote-tag

[mark2185]

I think the simplest thing would be to rename the master branch to main in your fork.

Unset the upstream via the menu, rename the branch to main and push it to origin/main. Tried it now and it works, and requires no intervention from our side.

The tag named refs/heads/master is not something I have come across, so I take it this workaround will suffice even for others who find themselves in such a situation.

[AndrewSav]

@mark2185

Is this expected?

[mark2185]

Could you describe the steps you took?

I did something like this:

• unset upstream of branch master (press u and select unset upstream)
• rename with R to main
• press P to push
• select upstream main since upstream points to my fork

[AndrewSav]

Yes, it looks I messed something up, never mind. It's working now, thank you very much for your help with this and other queries, really appreciate it, you rock!

I pressed u and set upstream to the upstream master which I was not supposed to do, which resulted in this section:

[branch "main"]
	remote = upstream
	merge = refs/heads/master

I changed that to:

[branch "main"]
	remote = origin
	merge = refs/heads/main

And it is working so far. The upstream's function is to be able to merge back the changes in the upstream, I have not tested it but it looks like it should work too.

select upstream main since upstream points to my fork

not sure what this bit means, according to the github page I linked for setting up fork with an upstream upstream is supposed to point to where you forked it from.

[mark2185]

not sure what this bit means, according to the github page I for setting up fork with an upstream upstream is supposed to point to where you forked it from.

I didn't read it that carefully, my bad. 😅

All that matters is that you got it working! :)

P.S. update lazygit from time to time, latest version is v0.40.2