git log and cherry-picks

git log and cherry-picks

[Erez Zilber]

Hi,

I saw that I can run git log with '--cherry-pick'. With this, if I run
"git log --cherry-pick branch_a..branch_b", it doesn't show
differences that are caused by cherry picks.

My question is: sometimes, cherry picking from branch_a to branch_b is
not immediate, and I need to adapt the patch that was committed on
branch_a to apply on branch_b. In other cases, git is able to apply
the patch on branch_b automatically (e.g. if there's only a line
offset). In such cases, will "git log --cherry-pick" ignore these
cherry-picks like it ignores cherry-picks that were applied without
any problem?

Thanks,
Erez

Re: git log and cherry-picks

[Michael J Gruber]

Erez Zilber venit, vidit, dixit 28.06.2010 18:02:
> Hi,
> 
> I saw that I can run git log with '--cherry-pick'. With this, if I run
> "git log --cherry-pick branch_a..branch_b", it doesn't show
> differences that are caused by cherry picks.
> 
> My question is: sometimes, cherry picking from branch_a to branch_b is
> not immediate, and I need to adapt the patch that was committed on
> branch_a to apply on branch_b. In other cases, git is able to apply
> the patch on branch_b automatically (e.g. if there's only a line
> offset). In such cases, will "git log --cherry-pick" ignore these
> cherry-picks like it ignores cherry-picks that were applied without
> any problem?

With --cherry-pick, log omits those commits whose associated patch has
the same patch-id (see "git patch-id").

Michael

Re: git log and cherry-picks

[Erez Zilber]

On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Erez Zilber venit, vidit, dixit 28.06.2010 18:02:
>> Hi,
>>
>> I saw that I can run git log with '--cherry-pick'. With this, if I run
>> "git log --cherry-pick branch_a..branch_b", it doesn't show
>> differences that are caused by cherry picks.
>>
>> My question is: sometimes, cherry picking from branch_a to branch_b is
>> not immediate, and I need to adapt the patch that was committed on
>> branch_a to apply on branch_b. In other cases, git is able to apply
>> the patch on branch_b automatically (e.g. if there's only a line
>> offset). In such cases, will "git log --cherry-pick" ignore these
>> cherry-picks like it ignores cherry-picks that were applied without
>> any problem?
>
> With --cherry-pick, log omits those commits whose associated patch has
> the same patch-id (see "git patch-id").
>
> Michael
>

Is there another way to get over this (a commit that was cherry-picked
from branch_a to branch_b and had to be changed to be applied on
branch_b)?

Thanks,
Erez

Re: git log and cherry-picks

[Antriksh Pany]

Well, I typically leave the commit subject (first line) the same even
if I make minor modifications to a cherry-picked commit.

If that's the case with you, you can write a basic shell script that
looks at the commit message and discards duplicates.

Cheers
Antriksh Pany

On Tue, Jun 29, 2010 at 1:55 AM, Erez Zilber <erezzi.list@gmail.com> wrote:
> On Mon, Jun 28, 2010 at 10:07 PM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Erez Zilber venit, vidit, dixit 28.06.2010 18:02:
>>> Hi,
>>>
>>> I saw that I can run git log with '--cherry-pick'. With this, if I run
>>> "git log --cherry-pick branch_a..branch_b", it doesn't show
>>> differences that are caused by cherry picks.
>>>
>>> My question is: sometimes, cherry picking from branch_a to branch_b is
>>> not immediate, and I need to adapt the patch that was committed on
>>> branch_a to apply on branch_b. In other cases, git is able to apply
>>> the patch on branch_b automatically (e.g. if there's only a line
>>> offset). In such cases, will "git log --cherry-pick" ignore these
>>> cherry-picks like it ignores cherry-picks that were applied without
>>> any problem?
>>
>> With --cherry-pick, log omits those commits whose associated patch has
>> the same patch-id (see "git patch-id").
>>
>> Michael
>>
>
> Is there another way to get over this (a commit that was cherry-picked
> from branch_a to branch_b and had to be changed to be applied on
> branch_b)?
>
> Thanks,
> Erez
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>