Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

[Solved]GitFlow "Finish Feature" fails using SourceTree

ChrMue
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
September 4, 2018

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.
 

1 answer

1 vote
minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
September 6, 2018

My initial assumption is that you've upgraded to a broken version of the Git Credential Manager.

Can you check what version of Git you are using, you can see this in the Tools/Options/Authentication tab, and the version of the Git Credential Manager you are using, you can do this in the Terminal by running:

>git credential-manager version

Also can you, in the Terminal, set the following environment variable

GCM_TRACE=1

And then run a git pull or push?

This will produce logging for the Git Credential Manager.

Version 1.17.1 has fixes for Bitbucket authentication and can be downloaded from here https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases/tag/v1.17.1

minnsey
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
September 6, 2018

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

ChrMue
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
September 7, 2018

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

bs-thomas October 18, 2018

@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?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events