sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

remove old rebase code now that we're only ever interactively rebasing

Browse Source
This commit is contained in:
Jesse Duffield Duffield
2019-02-24 11:03:14 +11:00
parent 95d451e59a
commit 1a19b1412d
3 changed files with 13 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/commands/git.go
View File

@ -419,22 +419,9 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
return strings.Contains(output, "conclude merge") || strings.Contains(output, "unmerged paths"), nil
}
// RebaseMode returns "" for non-rebase mode, "normal" for normal rebase
// and "interactive" for interactive rebase
func (c *GitCommand) RebaseMode() (string, error) {
exists, err := c.OSCommand.FileExists(".git/rebase-apply")
if err != nil {
return "", err
}
if exists {
return "normal", nil
}
exists, err = c.OSCommand.FileExists(".git/rebase-merge")
if exists {
return "interactive", err
} else {
return "", err
}
// IsInRebasingState tells us if we are rebasing
func (c *GitCommand) IsInRebasingState() (bool, error) {
return c.OSCommand.FileExists(".git/rebase-merge")
}
// RemoveFile directly