Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Missing Start Feature right after Gitflow init

Jan Tošovský March 21, 2019

When Gitflows in the new repository is initialized via Sourcetree (3.1.2), on one computer it doesn't offer Start Feature, but Finish Feature option. If the Start Feature is selected from Other Actions dialog, it seems to be working, but the status of the repository is somehow affected. This feature branch cannot be merged. And also other starting/finishing operations (e.g. start Release) are confused.

Everything works correctly on another computer. Is there any Gitflow status which could be somehow reset?

Win 10 64-bit, Git 2.21

1 answer

0 votes
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 22, 2019

Hi

Is it possible the git-flow state was already committed and then pull from another user?

You can see what git-flows underlying view of the state of the repository from the command like, e.g.

>Git flow feature list

etc see https://github.com/nvie/gitflow/wiki/Command-Line-Arguments

Sourcetree will show options depending on what it sees as the current state of the repository, I.e. if it believes the current branch is an open feature then the options it shows by default will be those to do with completing that feature.

Is that repository on that workstation on a feature branch?

minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 22, 2019

FWIW When clicking the Git-Flow button Sourcetree should be comparing the name of the current branch against the various prefixes, hotfix/, feature/ etc and then using that match or lack of it to decide what options to show.

minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 22, 2019

So far we've only been able to reproduce this with Git 2.21.0, potentially it is a change it that. Can you confirm that it works with Git < 2.21.0 ?

David Keaveny March 24, 2019

I'm currently using the System Git version 2.21.0/LibGit2Sharp 0.25.4 + git-lfs v2.7.1. If I switch to the embedded version, which is 2.20.1/LibGit2Sharp 0.25.4 + git-lfs v2.6.1, then the Finish Hotfix menu action appears. I haven't tried it yet, because I haven't finished the hotfix yet, but just the fact that it is there now when it wasn't before gives me a bit of confidence.

Jan Tošovský March 25, 2019

I can confirm it works fine if Git is downgraded to 2.20 version (embedded one). It is indeed the only difference between both computers.

minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 25, 2019

Thanks for confirming, we are continuing to investigate. 

minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 25, 2019

It looks like an update to fix this should be on its way via Git for Windows https://github.com/git-for-windows/git/issues/2139

Like Jan Tošovský likes this

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events