Re: [PATCH 03/15] sequencer: lib'ify do_pick_commit()

2016-08-26 Thread Johannes Schindelin
Hi Junio, On Thu, 25 Aug 2016, Junio C Hamano wrote: > > if (write_cache_as_tree(head, 0, NULL)) > > - die (_("Your index file is unmerged.")); > > + return error (_("Your index file is unmerged.")); > > While you are touching the line, it is a

Re: [PATCH 03/15] sequencer: lib'ify do_pick_commit()

2016-08-25 Thread Junio C Hamano
Johannes Schindelin writes: > To be truly useful, the sequencer should never die() but always return > an error. > > Signed-off-by: Johannes Schindelin > --- Instead of dying there, you let the caller high up in the callchain to notice

[PATCH 03/15] sequencer: lib'ify do_pick_commit()

2016-08-23 Thread Johannes Schindelin
To be truly useful, the sequencer should never die() but always return an error. Signed-off-by: Johannes Schindelin --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index 0c8c955..6ac2187 100644 ---