go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-21 12:16:54 +02:00
Code Issues Releases Activity

return on error when merging branches

Browse Source
This commit is contained in:
Jesse Duffield 2018-08-07 14:08:56 +10:00
parent 9bfaa9f62c
commit ab03902d08
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gitcommands.go
View File

@ -205,7 +205,10 @@ func branchAlreadyStored(branchLine string, branches []Branch) bool {
// directory i.e. things we've fetched but haven't necessarily checked out. // 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 // Worth mentioning this has nothing to do with the 'git merge' operation
func getAndMergeFetchedBranches(branches []Branch) []Branch { func getAndMergeFetchedBranches(branches []Branch) []Branch {
rawString, _ := runDirectCommand(getHeadsCommand) rawString, err := runDirectCommand(getHeadsCommand)
if err != nil {
return branches
}
branchLines := splitLines(rawString) branchLines := splitLines(rawString)
for _, line := range branchLines { for _, line := range branchLines {
if branchAlreadyStored(line, branches) { if branchAlreadyStored(line, branches) {