From: John Szakmeister <john@szakmeister.net>
Date: Tue, 30 Apr 2013 16:47:36 GMT
Subject: Re: git log -p unexpected behaviour - security risk?
Message-ID: <CAEBDL5W8YWu8_TV7o0s3ZZomETz8RPWnr8oOmy0xQ=U8o0xe0Q@mail.gmail.com>
In-Reply-To: <7va9ogezzx.fsf@alter.siamese.dyndns.org>

On Tue, Apr 30, 2013 at 12:37 PM, Junio C Hamano <gitster@pobox.com> wrote:
> John Szakmeister <john@szakmeister.net> writes:
>
>>> When I added -c/--cc, I contemplated making -p imply --cc, but
>>> decided against it primarily because it is a change in traditional
>>> behaviour, and it is easy for users to say --cc instead of -p from
>>> the command line.
>>
>> FWIW, security aside, I would've like to have seen that.  I find it
>> confusing that merge commits that introduce code don't have a diff
>> shown when using -p.  And I find it hard to remember --cc.  BTW,
>> what's the mnemonic for it?  -p => patch, --cc => ?
>
> Compact combined.

Thank you.

> By the way, these options are _not_ about "showing merge commits
> that introduce code", and they do not help your kind of "security".
> As I repeatedly said, you would need "-p -m" for that.

I'm sorry, I didn't mean to imply that it's useful for security, just
that it better meets my expectations when -p is turned on.  I realize
there are some edges in the logic, but I'm fine with those edges.

-John