diff options
| author | Edward Thomson <ethomson@github.com> | 2016-12-29 11:07:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 11:07:37 +0000 |
| commit | 238b8ccd1aeec0e0d6e50c5050527a8107304bfb (patch) | |
| tree | 93a9b014519965d24c326f870c60101151523177 | |
| parent | 7829b4118a17e5dfde6ede34ae14ced80fd10359 (diff) | |
| parent | f928c69a07168b1236be13b61a6dcb3ecb7a0871 (diff) | |
| download | libgit2-238b8ccd1aeec0e0d6e50c5050527a8107304bfb.tar.gz | |
Merge pull request #4048 from jacquesg/rebase-error-check
rebase: check the result code of rebase_init_merge
| -rw-r--r-- | src/rebase.c | 2 |
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; |