Creating pull requests when using worktrees

[ns-rse]

I've recently started using Git worktrees for some of the projects I work on.

Forge can pull the existing issues and pull-requests no problem from any given worktree/branch I have checked out and I can push/pull changes no problem too.

I really like the simplicity of being able to create my pull-requests via Forge but when I attempt to do this after pushing commits on a worktree/branch to GitHub and try N c p I'm prompted for Source branch. "Normally" when doing this from a single repository without worktrees and just branches the various branches on origin/ are listed to choose from. When using "worktree/branch" the Source branch proffers no list of branches on origin/ to choose from. I try manually entering a branch e.g. origin/ns-rse/branch-I-want-to-merge and hit Ret and am told [Match required]. Its as though Forge isn't aware of what branches are on origin/.

I can browse and comment on existing issues and pull-requests no problem though.

Is there perhaps some configuration option I need to enable to be able to create pull requests using this worktree/branch approach?

Had a search and couldn't find anything (although did learn about creating worktree for pull requests which I hadn't clocked despite it staring me in the face each time I created a new worktree!).

[tarsius]

I cannot reproduce that.

Are you sure the problem isn't that you haven't pushed ns-rse/branch-I-want-to-merge to any remote yet (on the respective forge)? You cannot create a pull-request on a forge for a branch the forge has no access to.

[ns-rse]

Ah, this could be the root cause!

Weirdly though I can push to the remote but Magit doesn't recognise this. In the magit: 37-dataclasses buffer...

Head:     ns-rse/37-dataclasses tests(classes): tests for Parameters class
Push:     origin/ns-rse/37-dataclasses does not exist

Untracked files (1)
.justfile

Stashes (2)
stash@{0} autostash
stash@{1} autostash

Recent commits
ebc9254 ns-rse/37-dataclasses tests(classes): tests for Parameters class
51ed6fd feature(classes): Introduce pydantic dataclasses
e402657 Merge pull request #93 from ICAIR-Sheffield/ns-rse/90-remove-ci.yaml

Worktrees (6)
(bare)                      ../../
main                        ../../main/
ns-rse/32-improve-typehints ../32-improve-typehints/
ns-rse/37-dataclasses       ~/work/git/hub/ICAIR-Sheffield/LayOpt/ns-rse/37-dataclasses/

Pull requests (7)
Issues (22)
Discussions (1)

I then P p to push and the magit-process: 37-dataclasses reports that its been pushed...

  0 git … push -v origin refs/heads/ns-rse/37-dataclasses\:refs/heads/ns-rse/37-dataclasses
Pushing to github.com:ICAIR-Sheffield/LayOpt.git
Enumerating objects: 13, done.
Writing objects: 100% (13/13), 11.79 KiB | 11.79 MiB/s, done.
Total 13 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
remote: 
remote: Create a pull request for 'ns-rse/37-dataclasses' on GitHub by visiting:        
remote:      https://github.com/ICAIR-Sheffield/LayOpt/pull/new/ns-rse/37-dataclasses        
remote: 
remote: GitHub found 3 vulnerabilities on ICAIR-Sheffield/LayOpt's default branch (2 high, 1 low). To find out more, visit:        
remote:      https://github.com/ICAIR-Sheffield/LayOpt/security/dependabot        
remote: 
To github.com:ICAIR-Sheffield/LayOpt.git
 * [new branch]      ns-rse/37-dataclasses -> ns-rse/37-dataclasses

But the magit: 37-dataclasses buffer still reports origin/ns-rse/37-dataclasses does not exist as it did prior to pushing. So for some reason (likely my config) Magit isn't aware of the upstream.

My config is indeed missing the branch tracking info as it only has...

[core]
	repositoryformatversion = 0
	filemode = true
	bare = true
[remote]
	pushDefault = origin
[remote "origin"]
	url = git@github.com:ICAIR-Sheffield/LayOpt.git
	fetch = +refs/pull/*/head:refs/pullreqs/*

But when not using I P p a to Push ns-rse/37-dataclasses to origin/ns-rse/37-dataclasses, creating it the config gets updated with the branch details and Magit then knows about it, so your diagnosis is correct Forge has no access to the branch as it doesn't know about.

I've tried placing pushDefault = origin under [remote "origin"] , and [push] without success, whilst the process shows the push is made (and the remote shows the branch) Magit doesn't recognise it.

I tried adding...

[branch "ns-rse/37-dataclasses"]
    remote = origin
    merge = refs/heads/ns-rse/37-dataclasses

...which resulted in the Magit buffer showing...

Head:     ns-rse/37-dataclasses tests(classes): tests for Parameters class
Rebase:   refs/heads/ns-rse/37-dataclasses does not exist on origin
Push:     origin/ns-rse/37-dataclasses does not exist

whichis confusing as I thought that would do the trick 😖

An aside...

Have just given magit-clone-bare a fresh go and whilst I successfully cloned the bare repository I noticed I wasn't prompted to Set 'remote.pushDefault' to "origin"? (y or n) as is normally the case with magit-clone

[tarsius]

This

[remote "origin"]
	url = git@github.com:ICAIR-Sheffield/LayOpt.git
	fetch = +refs/pull/*/head:refs/pullreqs/*

should be

[remote "origin"]
	url = git@github.com:ICAIR-Sheffield/LayOpt.git
	fetch = +refs/heads/*:refs/remotes/origin/*
	fetch = +refs/pull/*/head:refs/pullreqs/*

I don't know how that got deleted, but the things you tried won't restore it. Just add it manually and git fetch origin to create the remote tracking branches.

[ns-rse]

That did the trick, thank you so much for taking the time to help me trouble shoot this @tarsius 🙏

[tarsius]

Cheers!