From e23ed80eaae8a1fde099bbf3bad46ebcf3797b85 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 7 Aug 2018 14:10:15 +1000 Subject: [PATCH] use git branch when merging branches --- gitcommands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitcommands.go b/gitcommands.go index 2de3cbe9a..dfb91b914 100644 --- a/gitcommands.go +++ b/gitcommands.go @@ -205,7 +205,7 @@ func branchAlreadyStored(branchLine string, branches []Branch) bool { // directory i.e. things we've fetched but haven't necessarily checked out. // Worth mentioning this has nothing to do with the 'git merge' operation func getAndMergeFetchedBranches(branches []Branch) []Branch { - rawString, err := runDirectCommand(getHeadsCommand) + rawString, err := runDirectCommand("git branch") if err != nil { return branches }