[PATCH 02/15] sequencer: lib'ify do_recursive_merge()
From: Johannes Schindelin <hidden>
Date: 2016-08-23 16:08:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin <redacted> --- sequencer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index c75296c..0c8c955 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -303,7 +303,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next, if (active_cache_changed && write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ - die(_("%s: Unable to write new index file"), action_name(opts)); + return error(_("%s: Unable to write new index file"), + action_name(opts)); rollback_lock_file(&index_lock); if (opts->signoff)
--
2.10.0.rc1.99.gcd66998