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

rebase: check the result code of rebase_init_merge
This commit is contained in:
Edward Thomson 2016-12-29 11:07:37 +00:00 committed by GitHub
commit 238b8ccd1a

View File

@ -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;