summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Germishuys <jacquesg@striata.com>2016-12-29 12:54:26 +0200
committerJacques Germishuys <jacquesg@striata.com>2016-12-29 12:54:26 +0200
commitf928c69a07168b1236be13b61a6dcb3ecb7a0871 (patch)
tree93a9b014519965d24c326f870c60101151523177
parent7829b4118a17e5dfde6ede34ae14ced80fd10359 (diff)
downloadlibgit2-f928c69a07168b1236be13b61a6dcb3ecb7a0871.tar.gz
rebase: check the result code of rebase_init_merge
-rw-r--r--src/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rebase.c b/src/rebase.c
index 0af2b3cf4..ef044692a 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;