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

Re: help doing a hotfix bisect: cherry-pick -m ??

From
JCJim Cromie <jim.cromie@gmail.com>
Date
Sep 7, 2012, 21:55 UTC
Message-ID
<CAJfuBxw4_VhyGENcgsBp0WohapAAmiqfEstWF-gjcnUestBwLw@mail.gmail.com>
In-Reply-To
<7v627py6or.fsf@alter.siamese.dyndns.org>
On Fri, Sep 7, 2012 at 1:27 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 11 quoted lines
> Jim Cromie <jim.cromie@gmail.com> writes:
>
>> Broader question:
>
>> Im thinking that having a hotfix branch, and merging --no-commit would
>> work better,
>> especially when bisection lands on a commit which already contains
>> some of those in the hotfix branch.
>
> When your history leading to the "bad" commit contains only part of
> the hot-fix branch and not all of it, that may work better.
good, I have a 1/2 grip at least. thank you.

any tips on how to use the -m option ? Ive had no success passing small integers, and I need to include the commits from the merged branch

The only alternative I have is to rework the split *_deferred patch on top of the merge-point, and hope that it tests ok with the original hotfix patch, then I can probably do the bisect.

Previous: Junio C Hamano
Message 3 of 3 in “help doing a hotfix bisect: cherry-pick -m ??”
  1. Jim CromieSep 7, 2012
  2. Junio C HamanoSep 7, 2012
  3. Jim CromieSep 7, 2012

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.