On Tue, Aug 23, 2016 at 12:06 PM, Johannes Schindelin
<johannes.schindelin@xxxxxx> wrote:
> To be truly useful, the sequencer should never die() but always return
> an error.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
> diff --git a/sequencer.c b/sequencer.c
> @@ -180,17 +180,20 @@ static void print_advice(int show_hint, struct replay_opts *opts)
> -static void write_message(struct strbuf *msgbuf, const char *filename)
> +static int write_message(struct strbuf *msgbuf, const char *filename)
> {
> static struct lock_file msg_file;
>
> - int msg_fd = hold_lock_file_for_update(&msg_file, filename,
> - LOCK_DIE_ON_ERROR);
> + int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
> + if (msg_fd < 0)
> + return error_errno(_("Could not lock '%s'"), filename);
> if (write_in_full(msg_fd, msgbuf->buf, msgbuf->len) < 0)
> - die_errno(_("Could not write to %s"), filename);
> + return error_errno(_("Could not write to %s"), filename);
Does this need to rollback the lockfile before returning[*]?
[*] I'm not terribly familiar with the lockfile mechanism and I don't
have a lot of time to study it presently, so ignore me if this is a
stupid question.
> strbuf_release(msgbuf);
> if (commit_lock_file(&msg_file) < 0)
> - die(_("Error wrapping up %s."), filename);
> + return error(_("Error wrapping up %s."), filename);
> +
> + return 0;
> }
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html