summaryrefslogtreecommitdiffstats
path: root/pkg/commands
diff options
context:
space:
mode:
authorJesse Duffield Duffield <jesseduffieldduffield@Jesses-MacBook-Pro-3.local>2019-02-24 11:03:14 +1100
committerJesse Duffield Duffield <jesseduffieldduffield@Jesses-MacBook-Pro-3.local>2019-02-24 11:03:14 +1100
commit1a19b1412d3da03992403cf62fddf06031de2927 (patch)
tree404f1510bfd6d37e8971af16f129421c51f75be9 /pkg/commands
parent95d451e59a419933f6e5f90305ffc6fe8dbc448f (diff)
remove old rebase code now that we're only ever interactively rebasing
Diffstat (limited to 'pkg/commands')
-rw-r--r--pkg/commands/git.go19
1 files changed, 3 insertions, 16 deletions
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