Re: [PATCH 4/7] revert: allow single-pick in the middle of cherry-pick sequence

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Apr 5, 2012, 11:49 UTC
Message-ID: <CACBZZX53dhb2SYMcMrQnhm3nsdTvZOm_0BCbSdPEPNdT0vxgTA@mail.gmail.com>
In-Reply-To: <20111210125948.GE22035@elie.hsd1.il.comcast.net>

On Sat, Dec 10, 2011 at 13:59, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 22 quoted lines

>        /*
> +        * If we were called as "git cherry-pick <commit>", just
> +        * cherry-pick/revert it, set CHERRY_PICK_HEAD /
> +        * REVERT_HEAD, and don't touch the sequencer state.
> +        * This means it is possible to cherry-pick in the middle
> +        * of a cherry-pick sequence.
> +        */
> +       if (opts->revs->cmdline.nr == 1 &&
> +           opts->revs->cmdline.rev->whence == REV_CMD_REV &&
> +           opts->revs->no_walk &&
> +           !opts->revs->cmdline.rev->flags) {
> +               struct commit *cmit;
> +               if (prepare_revision_walk(opts->revs))
> +                       die(_("revision walk setup failed"));
> +               cmit = get_revision(opts->revs);
> +               if (!cmit || get_revision(opts->revs))
> +                       die("BUG: expected exactly one commit from walk");
> +               return single_pick(cmit, opts);
> +       }
> +
> +       /*
>         * Start a new cherry-pick/ revert sequence; but

This might be an issue introduced later in Ramkumar's code when he moved this around, but on git.git's e5056c0 I get this:

    $ ./git revert --author=Ævar :/i18n
    fatal: BUG: expected exactly one commit from walk

That should find and revert this, right:

    $ git --no-pager log --author=Ævar --grep="i18n" -1
    commit 5eb660e
    Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Date:   Sat Mar 10 12:29:35 2012 +0000

        perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER

        When I added the i18n infrastructure in v1.7.8-rc2-1-g5e9637c I forgot
        to install Git::I18N also when NO_PERL_MAKEMAKER=YesPlease was
        set. Change the generation of the fallback perl.mak file to do that.

        Now Git/I18N.pm is installed alongside Git.pm in such a way that
        anything that uses GITPERLLIB will find it.

        Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk>
        Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
        Signed-off-by: Junio C Hamano <gitster@pobox.com>