jakobehn / gitflow.vs Goto Github PK

It should be possible to hit return when starting features, releases and hotfixes

I was having trouble with the plugin detecting my existing install of GitFlow. After installing the plugin I would get the message "It looks like you don't have GitFlow installed. Let me do that for you." This was wrong, as I have GitFlow installed already, and clicking the "Install" button resulted in errors that I could see were happening in the Powershell script it runs, but the window disappeared too quickly for me to actually read the errors.

After tinkering for a while I found that, if I copied my whole Git directory from C:\Program Files\Git to C:\Program Files (x86)\Git the extension would detect the GitFlow binaries there and work as expected. I would assume that it would look at my Path variable to determine my Git directory, which is currently set to "%ProgramFiles%\Git\Cmd", but it only seems to want to look in Program Files (x86) for some reason.

I have cataloged all of this in the Q and A section of the Visual Studio Gallery page already, but I wanted to post my issue here as well.

I have no standalone git installed, but I'm using VS Community 2015 builtin git. And GitFlow can't find it.

There should be a |-character between the action links. Something like this:

Start feature | Start release | Start hotfix

See for example the Branches page.

Copied from gallery:

Love this extension - seems like tagging's not working, though. I see Running git flow hotfix finish -n "2.2.4_-_bugfix" -m + "2.2.5" -p, yet no tag. Ideas?

Hi, it seems that i can't switch between features on my projet with GitFlow, i have to go to the Branch and then switch feature. GitFlow actually see that i switched features.

Hope it can help.

I've just used the Finish feature function for the first time and the progress bar is just moving and moving and moving.
The output from GitFlow.VS is rather sparse. I'd like some confirmation that it is actually doing something and not stuck somewhere ...

I've just created a feature (gsc-62) and extension shows wrong author (not me) and wrong update time (3 hours instead of just now):

On my machine it takes several seconds before the GitFlow page shows up after I click the GitFlow button on the Team Explorer Home page.

Is there any plans to support the "Publish Release" feature of GitFlow?

When you finish a feature you can choose to delete the feature branch. It deletes the branch locally and remotely. That fine and all, however, it does not play so well with TFS Pull Requests. If the code only deleted the local branch, you could then go to tfs and it will allow you to complete the Pull Request. With the current behaviour the Pull Request is marked as abandoned.

You can control this deletion using these flags.
https://github.com/jakobehn/GitFlow.VS/search?utf8=%E2%9C%93&q=keepremote

k,[no]keep             Keep branch after performing finish
keepremote!            Keep the remote branch
keeplocal!             Keep the local branch

I have VS 2015. The features/Hotfixes/Release branches do get merged correctly but for some reason Visual studio always crashes. This happens for everyone in my 5 man team ;)

When I want to finish a hotfix I always get the message "fatal: could not read Password for 'https://...'

When I do the steps (merge to master and develop, push everything, delete the hotfix-branch...) manually it works.

When I call 'git flow hotfix finish hotfixname' in cmd everything works fine.

Any ideas?

Additional info:
I am using bitbucket for remote repos

Installed GitFlow on a client's Corporate computer (VS 2015.1), but "Initialize" fails with the following error message

Running git flow init -f fatal: 'flow' appears to be a git command, but we were not

It seems related to missing files or environment variables.

I repeated the install, this time openning VS 2015.1 with "Run as Administrator", but with the same results.

I suspect that it's related to security or policy on this one computer.

Which folders or settings could I check to confirm the installation?

Thanks

Our team has loved this integration. We wanted to suggest a feature request to have an option before starting a release or a hotfix to show the most recent 2-3 tags in the repo.

Since we are tagging by version per git flow and thereby naming the release/hotfix by the next version number, I still have to pull up source tree or the repo to get the last version of the specific project we used.

I have installed git version 2.6.3.windows.1 and use this method to install a https://github.com/nvie/gitflow/wiki/Windows#git-for-windows-previously-msysgit gitflow, in vs 2015 update 1 is installed Gitflow for Visual Studio 2015.

While opening GitFlow page in TeamExplorer on existing repository I get this error:

System.ComponentModel.Composition.CompositionException: The composition produced a single composition error. The root cause is provided below. Review the CompositionException.Errors property for more detailed information.

1) Object reference not set to an instance of an object.

Resulting in: An exception occurred while trying to create an instance of type 'GitFlowVS.Extension.GitFlowActionSection'.

Resulting in: Cannot activate part 'GitFlowVS.Extension.GitFlowActionSection'.
Element: GitFlowVS.Extension.GitFlowActionSection -->  GitFlowVS.Extension.GitFlowActionSection

Resulting in: Cannot get export 'GitFlowVS.Extension.GitFlowActionSection (ContractName="Microsoft.TeamFoundation.Controls.ITeamExplorerSection")' from part 'GitFlowVS.Extension.GitFlowActionSection'.
Element: GitFlowVS.Extension.GitFlowActionSection (ContractName="Microsoft.TeamFoundation.Controls.ITeamExplorerSection") -->  GitFlowVS.Extension.GitFlowActionSection

   at System.ComponentModel.Composition.Hosting.CompositionServices.GetExportedValueFromComposedPart(ImportEngine engine, ComposablePart part, ExportDefinition definition)
   at System.ComponentModel.Composition.Hosting.CatalogExportProvider.GetExportedValue(CatalogPart part, ExportDefinition export, Boolean isSharedPart)
   at System.ComponentModel.Composition.Hosting.CatalogExportProvider.CatalogExport.GetExportedValueCore()
   at System.ComponentModel.Composition.Primitives.Export.get_Value()
   at System.ComponentModel.Composition.ExportServices.GetCastedExportedValue[T](Export export)
   at System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.LifetimeContext.GetExportLifetimeContextFromExport[T](Export export)
   at System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.<>c__DisplayClass7`2.<CreateStronglyTypedExportFactoryOfTM>b__6()
   at System.ComponentModel.Composition.ExportFactory`1.CreateExport()
   at Microsoft.TeamFoundation.Controls.WPF.TeamExplorer.Framework.TeamExplorerSectionHost.Create()

Can you please add support of --squash and --no-ff keys for feature finish command? https://github.com/petervanderdoes/gitflow-avh/wiki/Reference:-git-flow-feature

This code should probably split off the *_prefix *_defined in the config

[gitflow "prefix"]
    feature = feature-
    release = release-
    hotfix = hotfix-
    support = support-
    versiontag =

or make the trailing symbol configurable from the .config file. our prefixes are using feature- instead of feature/

private string TrimBranchName(string branchName)
        {
            if( branchName.LastIndexOf('/') >= 0)
            {
                branchName = branchName.Substring(branchName.LastIndexOf('/')+1);
            }
            return branchName.Trim().Replace(" ", "_");
        }

One of the outputs from starting a hotfix is to bump the version number. I did this, checked in the changes and then finished the hotfix but I ended up with conflicts:

Running git flow hotfix start "HotFix-IntParseFailure"
Summary of actions:

• A new branch 'hotfix/HotFix-IntParseFailure' was created, based on 'master'
• You are now on branch 'hotfix/HotFix-IntParseFailure'

Follow-up actions:

• Bump the version number now!

• Start committing your hot fixes

• When done, run:

  git flow hotfix finish 'HotFix-IntParseFailure'

Running git flow hotfix finish -n "HotFix-IntParseFailure"Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
Merge made by the 'recursive' strategy.
RelHist2/RelHist2.Shared/Model/RHDate.cs | 2 ++
RelHist2/RelHist2.Shared/Model/RHFile.cs | 18 +++++++++++++-----
.../ViewModel/SourceCitationViewModel.cs | 8 ++++----
RelHist2/RelHist2.Windows/Package.appxmanifest | 2 +-
RelHist2/RelHist2.WindowsPhone/Package.appxmanifest | 2 +-
5 files changed, 21 insertions(+), 11 deletions(-)
Fatal: There were merge conflicts.
Auto-merging RelHist2/RelHist2.WindowsPhone/Package.appxmanifest
CONFLICT (content): Merge conflict in RelHist2/RelHist2.WindowsPhone/Package.appxmanifest
Automatic merge failed; fix conflicts and then commit the result.

I resolved the conflicts and finished the merge but GitFlow.VS doesn't think I'm in the middle of doing anything, so I still have the hotfix branch and I'm not sure what I should be doing to clean it up. I think can remove the hotfix branch as it looks like the develop branch has been updated, but I'm not sure.
I'm also not sure how I managed to get my branches into a state where there were merge conflicts. The ONLY conflict was in the version number.

It would be nice if you could see branch name on the GitFlow page above "Recommended actions", in the same way as you see it on the "Changes" and "Sync" pages.

For example "Branch: develop" where "develop" then would be a link to the "Branches" page.

When you click on the Home icon, you can see the GitFlow icon. When you click the dropdown next to the selected function in the Home tab GitFlow doesn't appear in the list.

To reproduce this:

1. Click on the GitFlow icon in the Home tab (GitFlow DOES appear at the top of the dropdown list, and is ticked)
2. Select Changes (or any other item in the dropdown list), make a commit (though not necessary to do this to see the problem)
3. Try to go back to GitFlow using the dropdown again (GitFlow is NOT in the list, like Changes, Branches etc is)

I love using GitFlow, and I also use the Team Explorer dropdown a lot to switch between Team Explorer functions (eg clicking Changes, making a commit, then clicking Sync, then maybe clicking Work Items). Not having GitFlow in the dropdown means that I always have to go back to the Home tab first (using the Home icon), then click on the GitFlow icon. I can use the dropdown for everything except GitFlow.

It should be possible to double click on a feature branch in order to check out that branch

Can you please add bugfixes support?

Hi, this is not an issue, but I was not sure the best way to contact you.. So I am the developer for a git plugin for VS 2015. One of the feature requests was to add GitFlow to my plugin. I saw your code and thought is looked great, but I just spent a lot of time getting rid of all the command line calls.. so I figured why not make a wrapper for libgit2sharp to do all the work.. Then I don't have to install the GitFlow Extensions project. Anyway.. I started the project here but stealing a bit of your fine code. Just wanted to say thanks. and say, if you are interested in help.. that would be awesome, or if you just want to use it in your project when you are done.. also awesome. Even if you don't do either .. just wanted to let you know..say thanks for helping me get started!

Have a good day..

I have Gitflow installed. It works fine via command line. But with the latest Visual Studio Tools for Apache Cordova the GitFlow Extension doesn't work anymore.

Would be very nice if you can create an push your realease to NuGet.

The extension only assumes that Git is installed beneath Program Files (x86)\Git (default location). It should check the PATH variable and the registry

I just installed V1.1.0.0 (per the extensions window's version of GitFlow for VS 2015), and ran into the same problem, unable to find git on this machine.
I have the x64 version of git installed into c:\Program Files\Git.
HKEY_LOCAL_MACHINE\SOFTWARE\GitForWindows has the install path, but this is the 64bit regkey.

Your check for Environment.SpecialFolder.ProgramFiles seems to always return the (x86) folder. (Is this compiled explicitly for 32bit, rather than AnyCPU?)

I'll get you a PR with a coded fix in a bit.

Reference to the x64 program files not working with 32bit compiled applications: https://social.msdn.microsoft.com/Forums/vstudio/en-US/37e798f5-1b9b-42ce-89af-486ee3531c0b/32-bit-app-how-to-get-cprogram-files-directory-using-environmentgetfolderpath?forum=csharpgeneral

I downloaded the source and did some checking around, but when i try to build the GitFlow.VS.Extension project i get the following error:

The "ReadReferencesFromVsixManifest" task was not given a value for the required parameter "InputFile". GitFlow.VS.Extension

I had to do some nuget restore and other stuff to get it to build the other projects, resolving them etc, but is this something anyone has encountered before?

I noticed today that you are using the gitfow avh version, which we are looking to use. However, you don't expose the support branch features. Are you planning to support that soon?

Thanks
Kevin

Specifically, the API call

https://jakob.visualstudio.com/DefaultCollection/_apis/public/build/definitions/da33bffd-4752-4c26-962d-a83d85e71d2f/114/badge

shows this image

We use prefixes like feature- or hotfix-
When I start feature "XXX" it displays it as "feature-XXX", and when you try to finish the feature it tries to merge branch "feature-feature-XXX" which doesn't exist.

I think the bug is in function GetAllBranchesThatStartsWithConfigPrefix
the code c => c.Name.Split('/').Last() is wrong
It should not depend on "/" character, it should just remove prefix

When I do a finish release action, I always end up getting a "back merge" into the develop branch. This adds an unnecessary merge commit to my develop branch. I see that there is an option in GitFlow package that allows you to control this option. Any plan to add this to the VS extension?

When going to the GitFlow section for the first time I get an error(see stacktrace below):

Another thing, I have a project where I installed GitFlow(using v0.9.23), but when opening this project on another PC(newest version) I get the install button, even though I can see the gitflow entries under repository settings(other). I don't get any errors though.

Microsoft.VisualStudio.Composition.CompositionFailedException: An exception was thrown while initializing part "GitFlowVS.Extension.GitFlowActionSection". ---> System.Runtime.InteropServices.MarshalDirectiveException: StrictFilePathMarshaler must be used on a FilePath.
   at LibGit2Sharp.Core.StrictFilePathMarshaler.MarshalManagedToNative(Object managedObj) in :line 0
   at System.StubHelpers.MngdRefCustomMarshaler.ConvertContentsToNative(IntPtr pMarshalState, Object& pManagedHome, IntPtr pNativeHome)
   at LibGit2Sharp.Core.NativeMethods.git_repository_open(RepositorySafeHandle& repository, FilePath path)
   at LibGit2Sharp.Core.Proxy.git_repository_open(String path)
   at LibGit2Sharp.Repository..ctor(String path, RepositoryOptions options)
   at GitFlow.VS.GitFlowWrapper.get_IsInitialized()
   at GitFlow.VS.GitFlowWrapper.get_IsOnFeatureBranch()
   at GitFlowVS.Extension.ViewModels.ActionViewModel.set_ShowFinishFeature(Visibility value)
   at GitFlowVS.Extension.ViewModels.ActionViewModel..ctor(GitFlowActionSection te)
   at GitFlowVS.Extension.GitFlowActionSection..ctor()
   --- End of inner exception stack trace ---
   at Microsoft.VisualStudio.Composition.RuntimeExportProviderFactory.RuntimeExportProvider.RuntimePartLifecycleTracker.CreateValue()
   at Microsoft.VisualStudio.Composition.ExportProvider.PartLifecycleTracker.Create()
   at Microsoft.VisualStudio.Composition.ExportProvider.PartLifecycleTracker.MoveNext(PartLifecycleState nextState)
   at Microsoft.VisualStudio.Composition.ExportProvider.PartLifecycleTracker.MoveToState(PartLifecycleState requiredState)
   at Microsoft.VisualStudio.Composition.ExportProvider.PartLifecycleTracker.GetValueReadyToExpose()
   at Microsoft.VisualStudio.Composition.ExportProvider.<>c__DisplayClass53_0.<CreateExport>b__0()
   at Microsoft.VisualStudio.Composition.ExportProvider.<>c__DisplayClass55_0.<CreateExportFactoryExport>b__1()
   at Microsoft.VisualStudio.Composition.ExportProvider.<>c__DisplayClass54_0.<CreateExportFactory>b__0()
   at Microsoft.VisualStudio.Composition.DelegateServices.<>c__DisplayClass2_0`1.<As>b__0()
   at System.ComponentModel.Composition.ExportFactory`1.CreateExport()
   at Microsoft.VisualStudio.Composition.NetFxAdapters.MefV1ExportProvider.ComposablePartDefinitionForExportFactory.CreatePart()
   at System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.LifetimeContext.GetExportLifetimeContextFromExport[T](Export export)
   at System.ComponentModel.Composition.ReflectionModel.ExportFactoryCreator.<>c__DisplayClass4`2.<CreateStronglyTypedExportFactoryOfTM>b__5()
   at System.ComponentModel.Composition.ExportFactory`1.CreateExport()
   at Microsoft.TeamFoundation.Controls.WPF.TeamExplorer.Framework.TeamExplorerSectionHost.Create()

When creating a new feature from the GitFlow menu, the extension crashes when a space is in the name. Other than ie SourceTree, the extension does not convert the spaces to underscores. You have to do it yourself.

After cloning my repo (bitbucket) and initializing it using the extension with all the defaults from the 'initialize-view', I am not able to start a hotfix or feature. I get the error: Fatal: Version tag not set. Please run 'git flow init'.

As far as I know you run a 'git flow init -f' command in the background and feed the StandardInput with the entered prefixes. That command should write some entries into the git-config-file but my config file only has only the following entry in the prefix-section:
[gitflow "prefix"]
feature = feature/

For some reason the command terminates before all the prefixes are written.

I recently updated my Git installation to the new v2.5, but after that GitFlow stopped working. Everything else Git related in VS 2015 works fine.

In the output I can see that it executes the command, but nothing happens and no errors are thrown. This happens for all three commands: feature, release and hotfix.

I've tried removing and reinstalling the extension but that doesn't help.

Is there a log where I can see what's going on or something else I can do to make it working again?

Hi

I sing Visual Studio 2013 to create default mvc project, then add to Git source control.

Click GitFlow always display 'InstrumentationKey cannot be empty.' error message.

http://i.imgur.com/fqbknD8.png

Bruce

Running git flow release start "Arcus-0.1.1"

Summary of actions:

• A new branch 'release/***-0.1.1' was created, based on 'develop'
• You are now on branch 'release/***-0.1.1'

Follow-up actions:

• Bump the version number now!

• Start committing last-minute fixes in preparing your release

• When done, run:

  git flow release finish '***-0.1.1'

Running git flow release finish "***-0.1.1" -n -k -p
fatal: could not read Username for '[[my tfs server name]]': Invalid argument
Fatal: Could not push branch 'develop' to remote 'origin'.

Would be nice to be able to pull a remote feature in (e.g. git flow feature pull origin MYFEATURE)

Although English is with good generality, but I believe that anyone would prefer to see mother tongue,
So more in line with Fool-proofing

Hi, I just created a new feature using vs 2015 ctp 6, done some changes and published all to git. At this point I have reopen it in my laptop using vs 2013: After the git sync, I initialized without problems gitflow for this project in the laptop, but I can't see the feature I created. If I try to create a new features I receive the error message that the branch is already present, but I don't see it in the feature list.
How can I solve this?

Information about prerequirements, build configurations and how to debug the extension needs to be documented

I have tried to build this and I cant seem to get it to build, it is missing references to microsoft.visualstudio.setting and TeamExplorer.Common.dll. I can't seem to find the right combination of nuget packages to get it to build. Do you have some insight on this?

When creating a new feature from the GitFlow menu, the extension crashes when a space is in the name. Other than ie SourceTree, the extension does not convert the spaces to underscores. You have to do it yourself.

Jakob,

I completed my first feature started via your Git Flow extension and wanted to go ahead and finish it, but the progress bar just kept going and going, and nothing was apparently happening.

Looking at the running processes, there were 3 git*.exe ones running but basically idle and after closing VS, killing the git processes and calling git flow finish myfeature from commandline, git was pretty quickly asking for credentials.. and after entering them etc it did finish in just a few seconds.

Now I tried the same with another feature in VS and the 'GitFlow.VS' output does not show the credentials-entering request and thereby gives no indication to what's going on and why it is 'taking forever'.

Now while having credentials stored in e.g. git-credential-winstore or the one the GitHub Windows client brings along does solve this problem, it would help if the VS output pane would, if credentials are required, either allow me to enter them there or at least give some sort of indication that those are missing.

Cheers!
-J

Installing the GitFlow on VS2015, each operation that involve changing the remote repository, like publish a feature branch or finish it, receives a "The command is taking longer than expected" on either team explorer or output window and we have to do it manually on git console. Note that we are using VSO for our repositories for the sake of information.

WHat is wrong?

Thanks