Hi Peff,

On Mon, 9 Jul 2018, Jeff King wrote:

> diff --git a/sequencer.c b/sequencer.c
> index f692b2ef44..234666b980 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3637,7 +3637,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
>                       return error(_("revision walk setup failed"));
>               cmit = get_revision(opts->revs);
>               if (!cmit || get_revision(opts->revs))
> -                     return error("BUG: expected exactly one commit from 
> walk");
> +                     return error(_("empty commit set passed"));

Should this not rather be

-               if (!cmit || get_revision(opts->revs))
-                       return error("BUG: expected exactly one commit from 
walk");
+               if (!cmit)
+                       return error(_("empty commit set passed"));
+               if (get_revision(opts->revs))
+                       return error(_("unexpected extra commit from walk"));

Ciao,
Dscho

Reply via email to