sublime_merge
sublime_merge copied to clipboard
Upstream branch name not respected when pushing
Version info
- OS: Fedora 41
- Build: 2102
Description
So I have a repository which is forked and locally I have main for the original repo, and I created a main-fork from the forked repo.
I wanted to then push main-fork to the remote fork with the branch name main.
I had done "Set upstream..." to the main branch. But then when I push it just ignores that and creates a fork-main branch on the fork remote.
You can see here that git says the upstream is set correctly:
$ git branch -vv
* fork-main ae848a4 [fork/main: ahead 6] Merge branch 'main' into fork-main
but it still pushes to fork/fork-main
Steps to reproduce
Steps to reproduce the behavior:
- Open a repository.
- Add a new remote called fork
- Make sure you have a local branch called
mainwhich tracksorigin/main - Now create a new local branch from
fork/maincalledfork-main - Check
git -vvto make sure it indicatesfork/mainis the upstream. If not go to submlime merge and right clickfork-mainand useSet Upstream...to set it tofork/mainand then check again - Now just hit the push button (you don't need to make any commits to
fork-mainat all, it will still create fork/fork-main`)
Expected behavior
I would expect it to push to fork/main, but instead it creates fork/fork-main and pushes it there
Debug Information
=== App Version Information ===
Build: 2102
=== Git Version Information ===
Using Git: git (system)
git version 2.47.0
PATH: /home/me/.nvm/versions/node/v22.4.1/bin:/home/me/.local/bin:/home/me/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/var/lib/snapd/snap/bin:/usr/local/go/bin:/home/me/.dotnet:/home/me/.dotnet/tools:/home/me/go/bin:/home/me/.local/share/JetBrains/Toolbox/scripts
=== Browse Page Information ===
HEAD: af874ee4223c322749888bef33433934e2e7c250
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0
=== Git Status Information ===
=== Our Status Information ===
=== Git Config Information ===
branch.fork-main.merge=refs/heads/main
branch.fork-main.remote=fork
branch.main.merge=refs/heads/main
branch.main.remote=origin
core.autocrlf=input
core.bare=false
core.filemode=true
core.logallrefupdates=true
core.repositoryformatversion=0
credential.https://gist.github.com.helper=!/usr/bin/gh auth git-credential
credential.https://githubhere.helper=!/usr/bin/gh auth git-credential
credential.https://githubhere.helper=!/usr/bin/gh auth git-credential
remote.fork.fetch=+refs/heads/*:refs/remotes/fork/*
remote.fork.url=git@githubhere:org/repo.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@githubhere:otherorg/repo.git
url.git@githubbhere:.insteadof=https://githubhere
[email protected]
user.name=me
=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /home/me/.config/git/config
Using config path: /home/me/.gitconfig
Using config path: /home/me/repos/repo/.git/config
Our config output is identical to the Git config output
=== Git Attributes Information ===
git check_attr --all output
=== Our Modified Files Newline Normalisation and EOL Information ===
=== Our Modified Files Flag Information ===
Ignoring symlinks: 0
=== Staged Files Information ===
=== Repository Statistics ===
Commit Count: 1364
Untracked Files Count: 0
Modified Files Count: 0
Staged Files Count: 0
Submodule Count: 0
Loose Objects Count: 28
Packfile Count: 2
G'day @HenrikPoulsen,
Thanks for reaching out and sorry to hear this issue has affected you. I'll be investigating this further and will reach out again with an update.
Cheers, - Dylan from Sublime HQ
Hi @HenrikPoulsen,
Apologies for the delay. This should be resolved in Sublime Merge Build 2115 (development build).
Kind regards, Dylan from Sublime HQ