git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Baumann <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
To: git@vger.kernel.org
Subject: Re: [PATCH] config option core.showroot to enable showing the diff of the root commit
Date: Fri, 24 Nov 2006 08:53:56 +0100	[thread overview]
Message-ID: <slrnemd98k.a3v.Peter.B.Baumann@xp.machine.xx> (raw)
In-Reply-To: 7vzmahfx6q.fsf@assigned-by-dhcp.cox.net

On 2006-11-24, Junio C Hamano <junkio@cox.net> wrote:
>> "git-diff-tree --color HEAD" (with explicit command line
>> instruction to color it) still colours its output, but "[diff]
>> color = auto" in ~/.gitconfig would not affect the coloring.
>> Hence, "git-diff-tree HEAD" with the configuration entry gives
>> monochrome.
>>
>> "git diff HEAD" on the other hand looks at '[diff] color = auto"
>> and will color its output without being told on the command
>> line.
>
> Since this is about "log" family that deals with revision
> structure, how about....
>
> -- >8 --
> [PATCH] config option log.showroot to show the diff of root commits
[...]

Patch looks good.

One question, what's the difference between git-log -p and git-whatchanged -p?
I could only see it differ in the root commit handling.

Interesting parts marked with | as first character of the line.

  git-repo-config --get log.showroot
  false

  git-log -p 8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68
  commit 8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68
  Author: Linus Torvalds <torvalds@ppc970.osdl.org>
  Date:   Thu Apr 7 15:16:10 2005 -0700

      Add copyright notices.

      The tool interface sucks (especially "committing" information, which is just
      me doing everything by hand from the command line), but I think this is in
      theory actually a viable way of describing the world. So copyright it.

  diff --git a/cat-file.c b/cat-file.c
  index 74a0a23..d8f0121 100644
  --- a/cat-file.c
  +++ b/cat-file.c
  @@ -1,3 +1,8 @@
  +/*
  + * GIT - The information manager from hell
  + *
  + * Copyright (C) Linus Torvalds, 2005
  + */
   #include "cache.h"

   int main(int argc, char **argv)

  [... rest of the diff ...]

| commit e83c5163316f89bfbde7d9ab23ca2e25604af290
| Author: Linus Torvalds <torvalds@ppc970.osdl.org>
| Date:   Thu Apr 7 15:13:13 2005 -0700
|
|     Initial revision of "git", the information manager from hell
|
  [ ... as specified in log.showroot, no diff of the root commit ...]

  git-whatchanged -p 8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68
  commit 8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68
  Author: Linus Torvalds <torvalds@ppc970.osdl.org>
  Date:   Thu Apr 7 15:16:10 2005 -0700
  
      Add copyright notices.
      
      The tool interface sucks (especially "committing" information, which is just
      me doing everything by hand from the command line), but I think this is in
      theory actually a viable way of describing the world. So copyright it.
  
  diff --git a/cat-file.c b/cat-file.c
  index 74a0a23..d8f0121 100644
  --- a/cat-file.c
  +++ b/cat-file.c
  @@ -1,3 +1,8 @@
  +/*
  + * GIT - The information manager from hell
  + *
  + * Copyright (C) Linus Torvalds, 2005
  + */
   #include "cache.h"
   
   int main(int argc, char **argv)

  [... rest of the diff ...]
|
| [ ... no commit message etc from the root commit is shown ...]
|

As you can see, the root commit isn't shown. Is this intentional?
Or is it just me not getting the different meaning of git-log and
git-whatchanged?

Setting "log.showroot = true" the output of the 2 commands is identical.

Peter

  reply	other threads:[~2006-11-24  7:54 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-21 13:41 git-show --stat on first commit Andy Parkins
2006-11-21 14:01 ` Jakub Narebski
2006-11-21 14:09 ` Santi Béjar
2006-11-21 16:08   ` Peter Baumann
2006-11-21 16:18     ` Jakub Narebski
2006-11-21 17:16       ` Peter Baumann
2006-11-21 18:14       ` Horst H. von Brand
2006-11-21 16:31     ` Linus Torvalds
2006-11-21 16:47       ` Shawn Pearce
2006-11-21 17:11       ` Peter Baumann
2006-11-21 17:20         ` Linus Torvalds
2006-11-21 18:38         ` Olivier Galibert
2006-11-21 18:42           ` Shawn Pearce
2006-11-21 19:05           ` Petr Baudis
2006-11-21 18:06       ` Petr Baudis
2006-11-21 18:16         ` Jakub Narebski
2006-11-21 18:21           ` Petr Baudis
2006-11-21 18:34             ` Shawn Pearce
2006-11-21 18:39             ` Andy Parkins
2006-11-21 18:48               ` Petr Baudis
2006-11-21 18:52                 ` Shawn Pearce
2006-11-21 19:04                   ` Petr Baudis
2006-11-21 19:31             ` Junio C Hamano
2006-11-21 20:03               ` Jakub Narebski
2006-11-23  9:25                 ` Andy Parkins
2006-11-24  7:49                   ` Jakub Narebski
2006-11-23  9:36               ` [PATCH] config option core.showroot to enable showing the diff of the root commit Peter Baumann
2006-11-23 20:52                 ` Junio C Hamano
2006-11-23 23:34                   ` Peter Baumann
2006-11-24  0:18                     ` Junio C Hamano
2006-11-24  1:30                       ` Junio C Hamano
2006-11-24  7:53                         ` Peter Baumann [this message]
2006-11-24  8:54                           ` Junio C Hamano
2006-11-24  9:04                             ` Peter Baumann
2006-11-21 18:39       ` git-show --stat on first commit Carl Worth
2006-11-21 19:15       ` 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=slrnemd98k.a3v.Peter.B.Baumann@xp.machine.xx \
    --to=peter.b.baumann@stud.informatik.uni-erlangen.de \
    --cc=git@vger.kernel.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).