git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason Pyeron" <jpyeron@pdinc.us>
To: "Kyle Marek" <kmarek@pdinc.us>
Cc: "'Philippe Blain'" <levraiphilippeblain@gmail.com>,
	<git@vger.kernel.org>
Subject: RE: add a blank line when a commit has no parent in log output?
Date: Thu, 14 Jan 2021 15:44:59 -0500	[thread overview]
Message-ID: <196101d6eab6$20714550$6153cff0$@pdinc.us> (raw)
In-Reply-To: <abc900c1-16cc-4ad4-4be3-c405924215cd@gmail.com>

Kyle:

Need you to whip up a patch (back port it to current Cygwin git too), see below. It will help with cleaning up Cresaptown branches. Or if you think Watson can do it, give it to him.

> -----Original Message-----
> From: Philippe Blain <levraiphilippeblain@gmail.com>
> Sent: Thursday, January 14, 2021 2:29 PM
> To: git@vger.kernel.org; Jason Pyeron <jpyeron@pdinc.us>
> Subject: Re: add a blank line when a commit has no parent in log output?
> 
> Hi Jason,
> 
> Le 2021-01-14 à 13:30, Jason Pyeron a écrit :
> > Take this git log --format="%C(auto) %h% ad%d% s%C(green)% aE" --graph --date=short
> >
> > | | | *  5505e019c2 2014-07-09 initial xxxxxx@xxxx
> > | | | *  3e658f4085 2019-09-10 (wiki/wip-citest, origin/wip-citest) Added defau
> > | | | *  ad148aafe6 2019-09-10 Added default CI/CD Jenkinsfile (from f7daf088)
> >
> > One might assume 5505e019c2 and 3e658f4085 are related. But git cat-file -p 5505e019c2
> > tree 546c6b71f01e7fd086c8adb832518240b71a9075
> > author sam swindell <xxxxxx@xxxx> 1404878701 -0400
> > committer sam swindell <xxxxxx@xxxx> 1404878701 -0400
> >
> > initial
> >
> >
> > Is there a way to have it look like:
> >
> > | | | *  5505e019c2 2014-07-09 initial xxxxxx@xxxx
> > | | |
> > | | | *  3e658f4085 2019-09-10 (wiki/wip-citest, origin/wip-citest) Added defau
> > | | | *  ad148aafe6 2019-09-10 Added default CI/CD Jenkinsfile (from f7daf088)
> >
> > Or
> >
> > | | | #  5505e019c2 2014-07-09 initial xxxxxx@xxxx
> > | | | *  3e658f4085 2019-09-10 (wiki/wip-citest, origin/wip-citest) Added defau
> > | | | *  ad148aafe6 2019-09-10 Added default CI/CD Jenkinsfile (from f7daf088)
> >
> 
> If you remove '--graph', then you can add '--show-linear-break' [1]. Unfortunately
> these two options do not work together. I think your suggestion to have the '*'
> be changed to '#' for root commit is a great idea.

Patch description

When --graph is used

--show-linear-break converts the * to a #

--show-linear-break=x converts the * to a x

> 
> In the mean time, I use this trick:
> 
>      git log --date=short --format='%C(auto) %h% [%<(2,trunc)%p] ad%d% s%C(green)% aE'
> 
> This adds the abbreviated parent hashes (%p) but truncated to 2 characters ([2], [3]). So
> the brackets will be empty for root commits.
> 
> Cheers,
> 
> Philippe.
> 
> 
> [1] https://git-scm.com/docs/git-log#Documentation/git-log.txt---show-linear-breakltbarriergt
> [2] https://git-scm.com/docs/git-log#Documentation/git-log.txt-empem
> [3] https://git-scm.com/docs/git-log#Documentation/git-log.txt-emltltNgttruncltruncmtruncem


  reply	other threads:[~2021-01-14 20:45 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-14 18:30 add a blank line when a commit has no parent in log output? Jason Pyeron
2021-01-14 19:29 ` Philippe Blain
2021-01-14 20:44   ` Jason Pyeron [this message]
2021-01-17 11:03     ` [PATCH 0/2] Option to modify revision mark for root commits Kyle Marek
2021-01-17 11:03       ` [PATCH 1/2] revision: Denote root commits with '#' Kyle Marek
2021-01-17 21:10         ` Junio C Hamano
2021-01-18  7:56           ` Kyle Marek
2021-01-18 19:15             ` Junio C Hamano
2021-01-18 20:33               ` Junio C Hamano
2021-01-19  7:43                 ` Kyle Marek
2021-01-19 22:10                   ` Junio C Hamano
2021-01-20  3:25                     ` Kyle Marek
2021-01-20  6:47                       ` Junio C Hamano
2021-01-20 15:11                         ` Jason Pyeron
2021-01-20 21:52                           ` Junio C Hamano
2021-01-20 23:01                             ` Jason Pyeron
2021-01-23 18:07                               ` Junio C Hamano
2021-01-23 23:02                                 ` Jason Pyeron
2021-01-23 23:45                                   ` Junio C Hamano
2021-01-24  0:02                                     ` Jason Pyeron
2021-01-25  7:00                                       ` Junio C Hamano
2021-01-17 22:44         ` Junio C Hamano
2021-01-17 11:03       ` [PATCH 2/2] revision: implement --show-linear-break for --graph Kyle Marek
2021-01-17 22:56         ` Junio C Hamano
2021-01-18  2:09           ` Junio C Hamano
2021-01-18  7:56             ` Kyle Marek
2021-01-18 21:01               ` Junio C Hamano
2021-01-19  7:44                 ` Kyle Marek
2021-01-15  1:12 ` add a blank line when a commit has no parent in log output? 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='196101d6eab6$20714550$6153cff0$@pdinc.us' \
    --to=jpyeron@pdinc.us \
    --cc=git@vger.kernel.org \
    --cc=kmarek@pdinc.us \
    --cc=levraiphilippeblain@gmail.com \
    /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).