So I use "--show-decorations" all the time because I find it very useful
to see where the origin branch is, where tags are etc. In fact, my global
git config file has
[log]
decorate = auto
in it, so that I don't have to type it out all the time when I just do my
usual 'git log". It's lovely.
However, it does make one particular case uglier: with commit decorations,
the "oneline" commit format ends up being not very pretty:
[torvalds@i7 git]$ git log --oneline -10
3f07dac29 (HEAD -> master) pathspec: don't error out on all-exclusionary pathspec patterns
ca4a562f2 pathspec magic: add '^' as alias for '!'
02555c1b2 ls-remote: add "--diff" option to show only refs that differ
6e3a7b339 (tag: v2.12.0-rc0, origin/master, origin/HEAD) Git 2.12-rc0
fafca0f72 Merge branch 'cw/log-updates-for-all-refs-really'
74dee5cfa Merge branch 'pl/complete-diff-submodule-diff'
36acf4123 Merge branch 'rs/object-id'
ecc486b1f Merge branch 'js/re-running-failed-tests'
4ba6bb2d1 Merge branch 'sb/submodule-update-initial-runs-custom-script'
5348021c6 Merge branch 'sb/submodule-recursive-absorb'
and note how the decoration comes right after the shortened commit hash,
breaking up the alignment of the messages.
The above doesn't show it with the colorization: I also have
[color]
ui=auto
so on my terminal the decoration is also nicely colorized which makes it
much more obvious, it's not as obvious in this message.
The oneline message handling is already pretty special, this makes it even
more special by putting the decorations at the end of the line:
3f07dac29 pathspec: don't error out on all-exclusionary pathspec patterns (HEAD -> master)
ca4a562f2 pathspec magic: add '^' as alias for '!'
02555c1b2 ls-remote: add "--diff" option to show only refs that differ
6e3a7b339 Git 2.12-rc0 (tag: v2.12.0-rc0, origin/master, origin/HEAD)
fafca0f72 Merge branch 'cw/log-updates-for-all-refs-really'
74dee5cfa Merge branch 'pl/complete-diff-submodule-diff'
36acf4123 Merge branch 'rs/object-id'
ecc486b1f Merge branch 'js/re-running-failed-tests'
4ba6bb2d1 Merge branch 'sb/submodule-update-initial-runs-custom-script'
5348021c6 Merge branch 'sb/submodule-recursive-absorb'
which looks a lot better (again, this is all particularly noticeable with
colorization).
NOTE! There's a very special case for "git log --oneline -g" that shows
the reflogs as oneliners, and this does *not* fix that special case. It's
a lot more involved and relies on the exact show_reflog_message()
implementation, so I left the format for that alone, along with a comment
about how it's not at the end of line.
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
---
I've signed off on this, because I think it's an "obvious" improvement,
but I'm putting the "RFC" in the subject line because this is clearly a
subjective thing.
"oneline" really is special: the other commit formats will just put the
commit SHA1 at the end of the line anyway. And with manual formats, the
placement of decorations is also manual, so this doesn't affect that
case.
Comments?
log-tree.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/log-tree.c b/log-tree.c
index 8c2415747..3bf88182e 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -622,10 +622,13 @@ void show_log(struct rev_info *opt)
find_unique_abbrev(parent->object.oid.hash,
abbrev_commit));
fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
- show_decorations(opt, commit);
if (opt->commit_format == CMIT_FMT_ONELINE) {
+ /* Not at end of line, but.. */
+ if (opt->reflog_info)
+ show_decorations(opt, commit);
putc(' ', opt->diffopt.file);
} else {
+ show_decorations(opt, commit);
putc('\n', opt->diffopt.file);
graph_show_oneline(opt->graph);
}
@@ -716,6 +719,8 @@ void show_log(struct rev_info *opt)
opt->missing_newline = 0;
graph_show_commit_msg(opt->graph, opt->diffopt.file, &msgbuf);
+ if (ctx.fmt == CMIT_FMT_ONELINE)
+ show_decorations(opt, commit);
if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
if (!opt->missing_newline)
graph_show_padding(opt->graph);