Re: [PATCH] log --oneline: put decoration at the end of the line

From: Jeff King <peff@peff.net>
Date: Sep 19, 2012, 18:20 UTC
Message-ID: <20120919182039.GE11699@sigill.intra.peff.net>
In-Reply-To: <1348055540-13774-1-git-send-email-pclouds@gmail.com>

On Wed, Sep 19, 2012 at 06:52:20PM +0700, Nguyen Thai Ngoc Duy wrote:

> I find it easier to read "git log --oneline" when the subject lines
> align, which they don't when the log is decorated because the
> decoration stands before the subject line.

I like it. I turned on log.decorate some time ago, and I always felt that --oneline was a little bit messy. But for some reason I never thought of this simple change.

> I'm on colored output so moving decoration to the end of line does not
> make it harder to recognize refs. What about black-and-white people?

Like you, I use colors. I think the decorations would be much harder to see if not for the color.

We should also consider briefly whether anybody is relying on --oneline for machine parsing. I think "log --oneline" is fair game, but I wonder if people calling "rev-list --decorate --oneline" should be considered. It seems kind of unlikely to me, considering that the decorate output is ambiguous to parse anyway (if you see parentheses, you cannot tell if it is decorate output or part of the commit subject).

I did not look too carefully at your patch, but I did notice an odd behavior with it. Try "git log --graph --oneline" in git.git. With stock git, I see this several lines down (apologies for the long lines):

  * | | | | | | | | | | | | | | | | | | | | | | | |   b1379ba Merge branch 'sb/send-email-reconfirm-fix'
  |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \  
  | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /  
  | |/| | | | | | | | | | | | | | | | | | | | | | |   
  | * | | | | | | | | | | | | | | | | | | | | | | | 6183749 (origin/sb/send-email-reconfirm-fix) send-email: initial_to and initial_reply_to are both optional

In other words, 6183749 looks fine: graph, decorations, then subject, all on the same line. But with your patch, I see:

  * | | | | | | | | | | | | | | | | | | | | | | | |   b1379ba Merge branch 'sb/send-email-reconfirm-fix'
  |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \  
  | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /  
  | |/| | | | | | | | | | | | | | | | | | | | | | |   
  | * | | | | | | | | | | | | | | | | | | | | | | | 6183749 send-email: initial_to and initial_reply_to are both optional
  | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / /  
  | |/| | | | | | | | | | | | | | | | | | | | | |    (origin/sb/send-email-reconfirm-fix)

The decoration is broken onto a separate line (with a newline in between). Oddly, if I start my log right at b1379ba, it looks OK. Which makes me think we are hitting some kind of line-wrapping code related to the width of the graph.

-Peff