go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

move working tree state function into git.go

Browse Source
This commit is contained in:
Jesse Duffield
2020-03-28 12:08:13 +11:00
parent 814ee24c8d
commit a9559a5c87
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/commands/git.go
View File

@ -1192,3 +1192,15 @@ func (c *GitCommand) colorArg() string {
func (c *GitCommand) RenameBranch(oldName string, newName string) error {
return c.OSCommand.RunCommand("git branch --move %s %s", oldName, newName)
}
func (c *GitCommand) WorkingTreeState() string {
rebaseMode, _ := c.RebaseMode()
if rebaseMode != "" {
return "rebasing"
}
merging, _ := c.IsInMergeState()
if merging {
return "merging"
}
return "normal"
}