Commit f928c69a07168b1236be13b61a6dcb3ecb7a0871

Jacques Germishuys 2016-12-29T12:54:26

rebase: check the result code of rebase_init_merge

1
2
3
4
5
6
7
8
9
10
11
12
13
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;