Trial run of adding newbase back

Addresses part of #19839
JuliaLang · Jan 10, 2017 · 85d062c · 85d062c
1 parent 0316883
commit 85d062c
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/base/libgit2/libgit2.jl b/base/libgit2/libgit2.jl
@@ -457,7 +457,7 @@ function merge!(repo::GitRepo;
 end
 
 """
-    LibGit2.rebase!(repo::GitRepo[, upstream::AbstractString])
+    LibGit2.rebase!(repo::GitRepo, upstream::AbstractString="", newbase::AbstractString="")
 
 Attempt an automatic merge rebase of the current branch, from `upstream` if provided, or
 otherwise from the upstream tracking branch.
@@ -472,7 +472,7 @@ a `GitError`. This is roughly equivalent to the following command line statement
     fi
 
 """
-function rebase!(repo::GitRepo, upstream::AbstractString="")
+function rebase!(repo::GitRepo, upstream::AbstractString="", newbase::AbstractString="")
     with(head(repo)) do head_ref
         head_ann = GitAnnotated(repo, head_ref)
         upst_ann  = if isempty(upstream)
@@ -489,10 +489,15 @@ function rebase!(repo::GitRepo, upstream::AbstractString="")
         else
             GitAnnotated(repo, upstream)
         end
+        onto_ann  = if isempty(newbase)
+                        Nullable{GitAnnotated}()
+                    else
+                        Nullable{GitAnnotated}(GitAnnotated(repo, newbase))
+        end
         try
             sig = default_signature(repo)
             try
-                rbs = GitRebase(repo, head_ann, upst_ann)
+                rbs = GitRebase(repo, head_ann, upst_ann, onto=onto_ann)
                 try
                     while (rbs_op = next(rbs)) !== nothing
                         commit(rbs, sig)
@@ -509,6 +514,9 @@ function rebase!(repo::GitRepo, upstream::AbstractString="")
                 close(sig)
             end
         finally
+            if !isempty(newbase)
+                close(get(onto_ann))
+            end
             close(upst_ann)
             close(head_ann)
         end