Added rebase support commands

zanuka · Dec 10, 2018 · 7a7e885 · 7a7e885
1 parent 34fd18a
commit 7a7e885
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
@@ -269,6 +269,10 @@ func (c *GitCommand) RebaseBranch(onto string) error {
 	return c.OSCommand.RunCommand(fmt.Sprintf("git rebase %s %s ", onto, curBranch))
 }
 
+func (c *GitCommand) ContinueRebaseBranch() error {
+	return c.OSCommand.RunCommand("git rebase --continue")
+}
+
 func (c *GitCommand) AbortRebaseBranch() error {
 	return c.OSCommand.RunCommand("git rebase --abort")
 }
@@ -450,6 +454,14 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
 	return strings.Contains(output, "conclude merge") || strings.Contains(output, "unmerged paths"), nil
 }
 
+func (c *GitCommand) IsInRebaseState() (bool, error) {
+	output, err := c.OSCommand.RunCommandWithOutput("git status --untracked-files=all")
+	if err != nil {
+		return false, err
+	}
+	return strings.Contains(output, "rebase in progress"), nil
+}
+
 // RemoveFile directly
 func (c *GitCommand) RemoveFile(file *File) error {
 	// if the file isn't tracked, we assume you want to delete it