Johannes Schindelin <[email protected]> writes:
> To be truly useful, the sequencer should never die() but always return
> an error.
>
> Signed-off-by: Johannes Schindelin <[email protected]>
> ---
I am still looking at sequencer.c in 'master', but I do not think
that the sole caller of this function, walk_revs_populate_todo(),
is prepared to act on an error return from this function and instead
it expects this to die() when in trouble. And I do not think I saw
the function touched in the steps so far.
So this step smells like a fishy conversion to me.
> sequencer.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 6ac2187..b90294f 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -621,7 +621,7 @@ static int do_pick_commit(struct commit *commit, struct
> replay_opts *opts)
> return res;
> }
>
> -static void prepare_revs(struct replay_opts *opts)
> +static int prepare_revs(struct replay_opts *opts)
> {
> /*
> * picking (but not reverting) ranges (but not individual revisions)
> @@ -631,10 +631,11 @@ static void prepare_revs(struct replay_opts *opts)
> opts->revs->reverse ^= 1;
>
> if (prepare_revision_walk(opts->revs))
> - die(_("revision walk setup failed"));
> + return error(_("revision walk setup failed"));
>
> if (!opts->revs->commits)
> - die(_("empty commit set passed"));
> + return error(_("empty commit set passed"));
> + return 0;
> }
>
> static void read_and_refresh_cache(struct replay_opts *opts)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
