From 1a19b1412d3da03992403cf62fddf06031de2927 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Duffield Date: Sun, 24 Feb 2019 11:03:14 +1100 Subject: remove old rebase code now that we're only ever interactively rebasing --- pkg/commands/git.go | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'pkg/commands') diff --git a/pkg/commands/git.go b/pkg/commands/git.go index a982f032b..7b2c2f2fa 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -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 -- cgit v1.2.3