git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Steven Drake <sdrake@xnet.co.nz>
Subject: Re: What's cooking in git.git (Mar 2010, #02; Sun, 07)
Date: Tue, 09 Mar 2010 16:58:04 -0800	[thread overview]
Message-ID: <7vvdd5t2lf.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20100309231306.GD25265@sigill.intra.peff.net> (Jeff King's message of "Tue\, 9 Mar 2010 18\:13\:07 -0500")

Jeff King <peff@peff.net> writes:

> On Mon, Mar 08, 2010 at 01:20:32AM -0800, Junio C Hamano wrote:
>
>> After thinking about this a bit more, I do not think it is a good idea to
>> disable configured decoration when an explicit --pretty is given.  A patch
>> to do so would be a trivial two-liner:
>> [...]
>> but there is one big difference between notes and decoration.  Decorations
>> are designed to be a small, one-per-ref tokens that would sit well on a
>> line that already has other essential informations, while notes are a lot
>> louder "in your face" annotations that occupy line(s) on their own.
>
> True, but turning off configured decorations also helps scripts. I think
> we can all agree that normal "git log" is not supposed to be consumed by
> scripts, but should "git log --pretty=raw" turn off configured
> decorations?
>
> With the current code, gitk (which calls "log --pretty=raw") barfs on a
> repository with log.decorate turned on.

Yuck.  Do you mean we would need _at least_ something like this?  I am
undecided if we should limit to FMT_RAW if that is the case, though.
Reading from "git log --pretty=raw" is just as unkosher as reading from
"git log --pretty=oneline", but a bigger question is do we still have
enough plumbing support to replace them, or Porcelain "log" has advanced
too much too quickly, leaving plumbing "rev-list" behind.

I can obviously rip the configuration variable support out.

Steven, what do you want to do?

 builtin-log.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/builtin-log.c b/builtin-log.c
index 0afba31..29a59b0 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -77,6 +77,8 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
 
 	if (!rev->show_notes_given && !rev->pretty_given)
 		rev->show_notes = 1;
+	if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW)
+		decoration_style = 0;
 
 	if (rev->diffopt.pickaxe || rev->diffopt.filter)
 		rev->always_show_header = 0;

  reply	other threads:[~2010-03-10  0:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-07 22:49 What's cooking in git.git (Mar 2010, #02; Sun, 07) Junio C Hamano
2010-03-08  9:20 ` Junio C Hamano
2010-03-09 23:13   ` Jeff King
2010-03-10  0:58     ` Junio C Hamano [this message]
2010-03-10 19:59       ` Jeff King
2010-03-08 12:23 ` SZEDER Gábor

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=7vvdd5t2lf.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=sdrake@xnet.co.nz \
    /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).