Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-5360

Finishing a release with git flow partially completes but fails silently

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Medium Medium
    • None
    • 2.7.1b1
    • General, Git

    • Mac OS 10.13.3, Sourcetree 2.7.1 (156), system git 1.8.3.2. Embedded git-flow.

    • Severity 3 - Minor

      The normal git-flow process when finishing a release is:

      1. Merge release branch into master
      2. Tag master with the release version
      3. Merge release branch into develop
      4. Delete release branch

      When used through Sourcetree, git-flow is only completing steps 1 & 2. No error dialogs.

      —

      To reproduce: make a test project initialized with git-flow, add a couple of commits on develop, start a new release, make a commit in the release branch and try and finish the release. I end up sat on master, release branch still there and develop missing the commit from the release branch.

      I installed git-flow using Homebrew and tried the same test from the command line with git-flow. It works fine.

      So I switched Sourcetree to system git-flow and tried again. I do get an error dialog now, with this message:

      flags:WARN getopt: illegal option – f

       -- /var/folders/h8/n_m5b8zs26bdcng40f1p2xp80000gn/T/SourceTreeTemp.1BO8Ra 1.3

      flags:FATAL unable to parse provided options with getopt.

            [SRCTREE-5360] Finishing a release with git flow partially completes but fails silently

            Raman Sidarakin (Inactive) added a comment -

            Fixed in Sourcetree 4.2.1

            Raman Sidarakin (Inactive) added a comment - Fixed in Sourcetree 4.2.1

            Nick Haddad added a comment -

            Okay, good stuff. Thank you for the clarification, and the workaround tip!

            Nick Haddad added a comment - Okay, good stuff. Thank you for the clarification, and the workaround tip!

            Richard Senior added a comment -

            The order of comments and edits might be confusing. I can confirm that my problem is fixed by either:

            a. Installing git-flow-avh and switching SourceTree to use system git-flow (linked to git-flow-avh).

            b. Installing git-flow-avh, creating the .gitflow_export file and using embedded git-flow.

            If you don't want a system git-flow, you should be able to work around the issue by installing gnu-getopt and creating the .gitflow_export file.

            Richard Senior added a comment - The order of comments and edits might be confusing. I can confirm that my problem is fixed by either: a. Installing git-flow-avh and switching SourceTree to use system git-flow (linked to git-flow-avh). b. Installing git-flow-avh, creating the .gitflow_export file and using embedded git-flow. If you don't want a system git-flow, you should be able to work around the issue by installing gnu-getopt and creating the .gitflow_export file.

            Nick Haddad added a comment -

            Richard, your most recent edit on that thread indicates that you had no success with the potential workaround, is this the case?

            Nick Haddad added a comment - Richard, your most recent edit on that thread indicates that you had no success with the potential workaround, is this the case?

            Richard Senior added a comment -

            See this thread in Atlassian Community for a workaround:

            https://community.atlassian.com/t5/Sourcetree-questions/Is-git-flow-broken-in-Sourcetree-2-7-1/qaq-p/728759#M20100

            Richard Senior added a comment - See this thread in Atlassian Community for a workaround: https://community.atlassian.com/t5/Sourcetree-questions/Is-git-flow-broken-in-Sourcetree-2-7-1/qaq-p/728759#M20100

            David Mečíř added a comment - - edited

            Same issue with my setup. SourceTree 2.7.1 (159), Mac OS 10.13.3.

            David Mečíř added a comment - - edited Same issue with my setup. SourceTree 2.7.1 (159), Mac OS 10.13.3.

            Nick Haddad added a comment -

            I am also experiencing this issue, Mac OS 10.12.6.

            Nick Haddad added a comment - I am also experiencing this issue, Mac OS 10.12.6.

              Unassigned Unassigned
              81f5ca0fe4fd Richard Senior
              Affected customers:
              5 This affects my team
              Watchers:
              7 Start watching this issue

                Created:
                Updated:
                Resolved: