git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] cherry-pick: make sure all input objects are commits

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Apr 11, 2013, 10:22 UTC
Message-ID
<CALkWK0n6FjGbXTqiOT_O6NbB5h0DLaNWKCCTQAFSO_BL-pPdBA@mail.gmail.com>
In-Reply-To
<20130411092638.GA12770@suse.cz>
Miklos Vajna wrote:
Show 13 quoted lines
> When a single argument was a non-commit, the error message used to be:
>
>         fatal: BUG: expected exactly one commit from walk
>
> For multiple arguments, when none of the arguments was a commit, the error was:
>
>         fatal: empty commit set passed
>
> Finally, when some of the arguments were non-commits, we ignored those
> arguments.  Instead, now make sure all arguments are commits, and for
> the first non-commit, error out with:
>
>         fatal: <name>: Can't cherry-pick a <type>
Thanks.  This is worth fixing.
Show 18 quoted lines
> diff --git a/sequencer.c b/sequencer.c
> index baa0310..eb25101 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1067,6 +1068,18 @@ int sequencer_pick_revisions(struct replay_opts *opts)
>         if (opts->subcommand == REPLAY_CONTINUE)
>                 return sequencer_continue(opts);
>
> +       for (i = 0; i < opts->revs->pending.nr; i++) {
> +               unsigned char sha1[20];
> +               const char *name = opts->revs->pending.objects[i].name;
> +
> +               if (!get_sha1(name, sha1)) {
> +                       enum object_type type = sha1_object_info(sha1, NULL);
> +
> +                       if (type > 0 && type != OBJ_COMMIT)
> +                               die(_("%s: can't cherry-pick a %s"), name, typename(type));
> +               }
else?  What happens if get_sha1() fails?
Show 13 quoted lines
> diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
> index 4e7136b..19c99d7 100755
> --- a/t/t3508-cherry-pick-many-commits.sh
> +++ b/t/t3508-cherry-pick-many-commits.sh
> @@ -55,6 +55,12 @@ one
>  two"
>  '
>
> +test_expect_success 'cherry-pick three one two: fails' '
> +       git checkout -f master &&
> +       git reset --hard first &&
> +       test_must_fail git cherry-pick three one two:
> +'

So you're testing just the third case (where commit objects are mixed with non-commit objects), which is arguably a bug. Okay.

Previous: Miklos VajnaNext: Miklos Vajna
Message 6 of 17 in “cherry-pick: better error message when the parameter is a non-commit”
  1. cherry-pick: better error message when the parameter is a non-commitMiklos Vajna, Apr 3, 2013
  2. Miklos VajnaApr 8, 2013
  3. Junio C HamanoApr 8, 2013
  4. Junio C HamanoApr 8, 2013
  5. cherry-pick: make sure all input objects are commitsMiklos Vajna, Apr 11, 2013
  6. Ramkumar RamachandraApr 11, 2013
  7. Miklos VajnaApr 11, 2013
  8. Ramkumar RamachandraApr 11, 2013
  9. cherry-pick: make sure all input objects are commitsMiklos Vajna, Apr 11, 2013
  10. Ramkumar RamachandraApr 11, 2013
  11. Thomas RastApr 15, 2013
  12. Junio C HamanoApr 15, 2013
  13. Junio C HamanoApr 15, 2013
  14. Michael HaggertyApr 16, 2013
  15. Junio C HamanoMay 9, 2013
  16. Junio C HamanoMay 9, 2013
  17. Miklos VajnaMay 10, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.