[Solved]GitFlow "Finish Feature" fails using SourceTree

Question

I'm using Sourcetree 2.6.10 on Windows 10.

It is possible to start a "New Feature".
But If I finish a feature I get the Message

sh.exe "C:\Program Files\Git\usr\bin\git-flow" feature finish Produktionsformular
fatal: HttpRequestException encountered.
   Fehler beim Senden der Anforderung.

Push and Pull give the same message but it works. The commits are completely transferred to BitBucket.

bs-thomas · Answer

@minnsey Thanks, your workaround seems to fix many HttpException issues.  Most exceptions seemed to have gone away already.

However, finish feature will still cause the exception even with the GCM 1.18.2 and Git 2.19.1.  So it will just halt, and at last I'll have to merge it manually.

My SourceTree is already using the System Git (the stuff I installed above).

Could this be something related to the GitFlow implementation or their bug?

ChrMue · Answer

Thank you very much, the work arround fixes the problem.

minnsey · Answer

I've done some more testing. I can reproduce this behaviour if I'm using a Git install that includes a broken Git Credential Manager for Windows (GCMW), essentially v1.16.1 and v1.16.2.

Sourcetree can detect the broken versions of Git Credential Manager and force the use of a working copy, v1.17.1, using the following parameters with Git calls

-c credential.helper= -c credential.helper="C:/Users/mminns/AppData/Local/ATLASS~1/SOURCE~1/GIT_EX~1/GIT-CR~1.EXE"

However it can't pass this through the git-flow sh.exe commands this will call Git without the overrides and uses the broken Git Credential Manager which fails to authenticate.

Until the fixed version of Git Credential Manager is shipped with a new Git for Windows release which is bundled with a new Sourcetree release please use the following work around.

Work Around

* Install a standard copy of Git 2.18 from https://gitforwindows.org/
* Install Git Credential Manager for Windows 1.17.1 https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.17.1
* Switch Sourcetree to use the installed Git 2.18/GCMW 1.17.1 in the Tools/Options/Git tab and click the Git version/System button