From: Jeff King <peff@peff.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC PATCH] show decorations at the end of the line
Date: Tue, 21 Feb 2017 16:08:08 -0500 [thread overview]
Message-ID: <20170221210808.3ryri33ve7w7csdp@sigill.intra.peff.net> (raw)
In-Reply-To: <CA+55aFwT2HUBzZO8Gpt9tHoJtdRxv9oe3TDoSH5jcEOixRNBXg@mail.gmail.com>
On Tue, Feb 21, 2017 at 12:40:11PM -0800, Linus Torvalds wrote:
> In fact, I played around with some formats, and the one I lines the
> most was actually one that split the line for decorations, but that
> one was admittedly pretty funky. It gives output like
>
> b9df16a4c (HEAD -> master)
> pathspec: don't error out on all-exclusionary pathspec patterns
> 91a491f05 pathspec magic: add '^' as alias for '!'
> c8e05fd6d ls-remote: add "--diff" option to show only refs that differ
> 20769079d (tag: v2.12.0-rc2, origin/master, origin/HEAD)
> Git 2.12-rc2
> 076c05393 Hopefully the final batch of mini-topics before the final
> c5b22b819 Merge branch 'jk/tempfile-ferror-fclose-confusion'
> 62fef5c56 Merge branch 'dp/submodule-doc-markup-fix'
> 1f73ff080 Merge branch 'jk/reset-to-break-a-commit-doc-updated'
> bf5f11918 Merge branch 'jk/reset-to-break-a-commit-doc'
> e048a257b Merge branch 'js/mingw-isatty'
>
> (which looks better with colorization than it looks in the email).
>
> But I'm not even going to send out that patch, because it was such an
> atrocious hack to line things up.
I was going to suggest a custom format string that does the same, but
what we have is not _quite_ flexible enough.
You can use "%+d" to insert a newline only when "%d" is not empty. But
it always inserts _before_ the decoration, not after. Likewise, you
cannot say "if it's not empty, then insert %d and a leading tab".
The for-each-ref formatting code has %(if), but it's not unified with
the commit-format ones.
So the best I could come up with is:
git config pretty.twoline '%C(auto)%h %s%C(auto)%+d'
git log --format=twoline
which looks like:
80ba04ed9 Merge branch 'svn-escape-backslash' of git://bogomips.org/git-svn
(origin/master, origin/HEAD)
20769079d Git 2.12-rc2
(tag: v2.12.0-rc2)
076c05393 Hopefully the final batch of mini-topics before the final
c5b22b819 Merge branch 'jk/tempfile-ferror-fclose-confusion'
62fef5c56 Merge branch 'dp/submodule-doc-markup-fix'
1f73ff080 Merge branch 'jk/reset-to-break-a-commit-doc-updated'
-Peff
next prev parent reply other threads:[~2017-02-21 21:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-11 18:02 [RFC PATCH] show decorations at the end of the line Linus Torvalds
2017-02-11 18:13 ` Linus Torvalds
2017-02-13 8:30 ` Junio C Hamano
2017-02-13 19:33 ` Linus Torvalds
2017-02-13 21:01 ` Junio C Hamano
2017-02-13 22:38 ` Jeff King
2017-02-14 22:11 ` Junio C Hamano
2017-02-15 0:29 ` Jeff King
2017-02-18 5:27 ` Junio C Hamano
2017-02-19 22:33 ` Linus Torvalds
2017-02-19 23:03 ` Jacob Keller
2017-02-20 0:46 ` Jeff King
2017-02-20 1:15 ` Junio C Hamano
2017-02-20 1:48 ` Linus Torvalds
2017-02-21 20:11 ` Junio C Hamano
2017-02-21 20:40 ` Linus Torvalds
2017-02-21 21:08 ` Jeff King [this message]
2017-02-21 21:47 ` Junio C Hamano
2017-02-21 22:24 ` Jeff King
2017-02-14 20:36 ` Stephan Beyer
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170221210808.3ryri33ve7w7csdp@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=torvalds@linux-foundation.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).