From: Junio C Hamano <gitster@pobox.com>
To: John Szakmeister <john@szakmeister.net>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
John Tapsell <johnflux@gmail.com>,
Simon Ruderich <simon@ruderich.org>,
Git List <git@vger.kernel.org>, Tay Ray Chuan <rctay89@gmail.com>
Subject: Re: git log -p unexpected behaviour - security risk?
Date: Tue, 30 Apr 2013 09:37:22 -0700 [thread overview]
Message-ID: <7va9ogezzx.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAEBDL5VspccUmkkYBf17soGTyT3sinjnnNzRB_kytnOr3OBVQw@mail.gmail.com> (John Szakmeister's message of "Tue, 30 Apr 2013 06:09:17 -0400")
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.
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.
next prev parent reply other threads:[~2013-04-30 16:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-11 10:36 git log -p unexpected behaviour - security risk? John Tapsell
2013-04-11 15:19 ` Tay Ray Chuan
2013-04-20 14:00 ` Simon Ruderich
2013-04-21 7:26 ` Junio C Hamano
2013-04-21 8:56 ` John Tapsell
2013-04-21 10:21 ` Jonathan Nieder
2013-04-21 13:46 ` John Tapsell
2013-04-21 15:56 ` Thomas Rast
2013-04-21 16:09 ` Jonathan Nieder
2013-04-21 18:42 ` Junio C Hamano
2013-04-30 10:09 ` John Szakmeister
2013-04-30 16:37 ` Junio C Hamano [this message]
2013-04-30 16:47 ` John Szakmeister
2013-04-30 17:05 ` Matthieu Moy
2013-04-30 17:58 ` John Szakmeister
2013-04-30 19:31 ` John Tapsell
2013-04-30 19:44 ` git log -p unexpected behaviour Junio C Hamano
2013-04-30 20:12 ` John Tapsell
2013-04-30 20:38 ` Junio C Hamano
2013-05-01 7:23 ` John Tapsell
2013-04-30 11:48 ` git log -p unexpected behaviour - security risk? shawn wilson
2013-04-21 18:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7va9ogezzx.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=john@szakmeister.net \
--cc=johnflux@gmail.com \
--cc=jrnieder@gmail.com \
--cc=rctay89@gmail.com \
--cc=simon@ruderich.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).