From f928c69a07168b1236be13b61a6dcb3ecb7a0871 Mon Sep 17 00:00:00 2001
From: Jacques Germishuys <jacquesg@striata.com>
Date: Thu, 29 Dec 2016 12:54:26 +0200
Subject: [PATCH] rebase: check the result code of rebase_init_merge

---
 src/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;