]> xenbits.xensource.com Git - people/gdunlap/xsatool.git/commitdiff
git: Implement Repo.RebaseAbort
authorGeorge Dunlap <george.dunlap@citrix.com>
Fri, 23 Jun 2017 15:59:08 +0000 (16:59 +0100)
committerGeorge Dunlap <george.dunlap@citrix.com>
Fri, 23 Jun 2017 15:59:08 +0000 (16:59 +0100)
Wish there were a better interface, but here we are.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
git.go

diff --git a/git.go b/git.go
index 8d5ebd32a7877ae56f2523f5681176f740f51840..e91d57864322fa09d875c8d1e66a982e9640ddcd 100644 (file)
--- a/git.go
+++ b/git.go
@@ -300,6 +300,12 @@ func (r Repo) Rebase(head string, base string, onto string) (out []byte, err err
        return
 }
 
+// FIXME: This needs a better interface
+func (r Repo) RebaseAbort() (out []byte, err error) {
+       out, err = r.gitCmd("rebase", "--abort")
+       return
+}
+
 func (r Repo) DisablePush() (err error) {
        node := "config.origin.pushurl"
        _, err = r.gitCmd("config", node, "http://localhost/fail")