Commit 238b8ccd1aeec0e0d6e50c5050527a8107304bfb
2016-12-29T11:07:37
Merge pull request #4048 from jacquesg/rebase-error-check rebase: check the result code of rebase_init_merge
diff --git a/src/rebase.c b/src/rebase.c
index 0af2b3c..ef04469 100644
--- a/src/rebase.c
+++ b/src/rebase.c
@@ -731,7 +731,7 @@ int git_rebase_init(
if (inmemory)
error = rebase_init_inmemory(rebase, repo, branch, upstream, onto);
else
- rebase_init_merge(rebase, repo, branch ,upstream, onto);
+ error = rebase_init_merge(rebase, repo, branch ,upstream, onto);
if (error == 0)
*out = rebase;