sequencer: lib'ify do_recursive_merge()
Instead of dying there, let the caller high up in the callchain notice the error and handle it (by dying, still). The only caller of do_recursive_merge(), do_pick_commit() already checks the return value and passes it on to its callers, so its caller must be already prepared to handle error returns, and with this step, we make it notice an error return from this function. So this is a safe conversion to make do_recursive_merge() callable from new callers that want it not to die, without changing the external behaviour of anything existing. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Sep 9, 2016 at 16:37 UTC
c527b55e74181291da9bf9d6ca4cd2f7133f934b
1 file changed
+2
-1
sequencer.c
+2
-1
@@ -303,7 +303,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
303
if (active_cache_changed &&
304
write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
305
/* TRANSLATORS: %s will be "revert" or "cherry-pick" */
306
- die(_("%s: Unable to write new index file"), action_name(opts));
306
+ return error(_("%s: Unable to write new index file"),
307
+ action_name(opts));
308
rollback_lock_file(&index_lock);
309
310
if (opts->signoff)