go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-11-26 09:00:57 +02:00
Code Issues Releases Activity

merge windows support hotfix

Browse Source
This commit is contained in:
Jesse Duffield 2018-08-07 15:45:04 +10:00
commit 6df4a3ff41
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gitcommands.go
View File

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"runtime"
"strings" "strings"
"time" "time"
@ -111,12 +112,20 @@ func mergeGitStatusFiles(oldGitFiles, newGitFiles []GitFile) []GitFile {
return result return result
} }
func platformShell() (string, string) {
if runtime.GOOS == "windows" {
return "cmd", "/c"
}
return "sh", "-c"
}
func runDirectCommand(command string) (string, error) { func runDirectCommand(command string) (string, error) {
timeStart := time.Now() timeStart := time.Now()
commandLog(command) commandLog(command)
shell, shellArg := platformShell()
cmdOut, err := exec. cmdOut, err := exec.
Command("bash", "-c", command). Command(shell, shellArg, command).
CombinedOutput() CombinedOutput()
devLog("run direct command time for command: ", command, time.Now().Sub(timeStart)) devLog("run direct command time for command: ", command, time.Now().Sub(timeStart))
return sanitisedCommandOutput(cmdOut, err) return sanitisedCommandOutput(cmdOut, err)
@ -174,7 +183,7 @@ func branchFromLine(line string, index int) Branch {
func getGitBranches() []Branch { func getGitBranches() []Branch {
branches := make([]Branch, 0) branches := make([]Branch, 0)
// check if there are any branches // check if there are any branches
branchCheck, _ := runDirectCommand("git branch") branchCheck, _ := runCommand("git branch")
if branchCheck == "" { if branchCheck == "" {
return append(branches, branchFromLine("master", 0)) return append(branches, branchFromLine("master", 0))
} }
@ -205,12 +214,14 @@ 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, err := runDirectCommand(getHeadsCommand) rawString, err := runDirectCommand("git branch --sort=-committerdate --no-color")
if err != nil { if err != nil {
return branches return branches
} }
branchLines := splitLines(rawString) branchLines := splitLines(rawString)
for _, line := range branchLines { for _, line := range branchLines {
line = strings.Replace(line, "* ", "", -1)
line = strings.TrimSpace(line)
if branchAlreadyStored(line, branches) { if branchAlreadyStored(line, branches) {
continue continue
} }
@ -564,11 +575,3 @@ git reflog -n100 --pretty='%cr|%gs' --grep-reflog='checkout: moving' HEAD | {
| tr -d ' ' | tr -d ' '
} }
` `
const getHeadsCommand = `git show-ref \
| grep 'refs/heads/\|refs/remotes/origin/' \
| sed 's/.*refs\/heads\///g' \
| sed 's/.*refs\/remotes\/origin\///g' \
| grep -v '^HEAD$' \
| sort \
| uniq`