[PATCH 03/15] sequencer: lib'ify do_pick_commit()
From: Johannes Schindelin <hidden>
Date: 2016-08-23 16:08:11
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index 0c8c955..6ac2187 100644
--- a/sequencer.c
+++ b/sequencer.c@@ -464,7 +464,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) * to work on. */ if (write_cache_as_tree(head, 0, NULL)) - die (_("Your index file is unmerged.")); + return error (_("Your index file is unmerged.")); } else { unborn = get_sha1("HEAD", head); if (unborn)
--
2.10.0.rc1.99.gcd66998