mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

More stuff

Browse source
This commit is contained in:
Jesse Duffield 2018-06-02 13:51:03 +10:00
parent a0c8fc8899
commit 80bcc7c16e
6 changed files with 105 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gitcommands.go
View file

@ -357,8 +357,19 @@ func gitRenameCommit(message string) (string, error) {
return runDirectCommand("git commit --allow-empty --amend -m \"" + message + "\"")
}
func gitFetch() (string, error) {
return runDirectCommand("git fetch")
}
func gitResetToCommit(sha string) (string, error) {
return runDirectCommand("git reset " + sha)
}
func gitNewBranch(name string) (string, error) {
return runDirectCommand("git checkout -b " + name)
}
func gitUpstreamDifferenceCount() (string, string) {
// TODO: deal with these errors which appear when we haven't yet pushed a feature branch
pushableCount, err := runDirectCommand("git rev-list @{u}..head --count")
if err != nil {
return "?", "?"
@ -367,7 +378,7 @@ func gitUpstreamDifferenceCount() (string, string) {
if err != nil {
return "?", "?"
}
return strings.Trim(pullableCount, " \n"), strings.Trim(pushableCount, " \n")
return strings.Trim(pushableCount, " \n"), strings.Trim(pullableCount, " \n")
}
func gitCommitsToPush() []string {