Commit 238b8ccd by Edward Thomson Committed by GitHub

Merge pull request #4048 from jacquesg/rebase-error-check

rebase: check the result code of rebase_init_merge
parents 7829b411 f928c69a
...@@ -731,7 +731,7 @@ int git_rebase_init( ...@@ -731,7 +731,7 @@ int git_rebase_init(
if (inmemory) if (inmemory)
error = rebase_init_inmemory(rebase, repo, branch, upstream, onto); error = rebase_init_inmemory(rebase, repo, branch, upstream, onto);
else else
rebase_init_merge(rebase, repo, branch ,upstream, onto); error = rebase_init_merge(rebase, repo, branch ,upstream, onto);
if (error == 0) if (error == 0)
*out = rebase; *out = rebase;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment