search

fork-dev / Tracker

Bug and issue tracker for Fork for Mac
515 stars 12 forks source link

Git flow - Init is not tracking existing remote branches #2159

Open milhouse1337 opened 5 months ago

milhouse1337 commented 5 months ago

We use Fork a lot internally we really love it! Thank you for this awesome work. 😍

There is this one bug that really drove me crazy with the Git flow integration.

If you activate (git flow init) an existing repo (that has 2 active branches, eg: master and develop) the default branch will be tracked correctly but not the second one. Here is an example, on this repo the default branch is develop and as you can see the master is not tracked, we have to manually check it.

Screenshot 2024-07-01 at 4 01 15 PM

Here is the repo config after a git flow init from Fork:

...
branch.develop.remote=origin
branch.develop.merge=refs/heads/develop
...

In fact, it's missing the following:

branch.master.remote=origin
branch.master.merge=refs/heads/master

My workaround right now is to use the cli to activate git flow (git flow init -d) this way all the remote branches are tracked correctly.

branch.develop.remote=origin
branch.develop.merge=refs/heads/develop
branch.master.remote=origin
branch.master.merge=refs/heads/master
DanPristupov commented 5 months ago

Thank you for reporting this bug.