Re: git log -p unexpected behaviour - security risk?

From: Simon Ruderich <simon@ruderich.org>
Date: Apr 20, 2013, 14:00 UTC
Message-ID: <20130420140051.GB29454@ruderich.org>
In-Reply-To: <CAHQ6N+qdA5Lck1_ByOYPOG4ngsztz3HQSw8c_U_K8OnDapj4bQ@mail.gmail.com>

On Thu, Apr 11, 2013 at 11:36:26AM +0100, John Tapsell wrote:

> Is there a way to make --cc default?

If you use aliases, something like this is easy:

    git config --global --add alias.lp 'log --patch --cc'

I use aliases heavily, so that's my fix for now.

But I think the current behaviour is unexpected for most (new?) users (including me). I thought -p would display all changes in all commits, including merges.

I guess changing -p's default behaviour to imply --cc is problematic, so I think we should document that -p doesn't generate patches for merges. Maybe something like this:

-- 8< --
Subject: [PATCH] Documentation/diff-options.txt: -p doesn't display merge changes

Signed-off-by: Simon Ruderich <simon@ruderich.org>
---
 Documentation/diff-options.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 104579d..cd35ec7 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -24,6 +24,10 @@ ifndef::git-format-patch[]
 --patch::
 	Generate patch (see section on generating patches).
 	{git-diff? This is the default.}
+ifdef::git-log[]
+	Changes introduced in merge commits are not displayed. Use `-c`,
+	`--cc` or `-m` to include them.
+endif::git-log[]
 endif::git-format-patch[]
 
 -U<n>::

-- 
1.8.2.1.513.gdedbb69.dirty

-- 8< --

Regards
Simon
-- 
+ privacy is necessary
+ using gnupg http://gnupg.org
+ public key id: 0x92FEFDB7E44C32F9