From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] diff: add --compact-summary option to complement --stat
Date: Thu, 18 Jan 2018 22:23:45 +0100 [thread overview]
Message-ID: <87bmhqj1y6.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20180118100546.32251-1-pclouds@gmail.com>
On Thu, Jan 18 2018, Nguyễn Thái Ngọc Duy jotted:
> This is partly inspired by gerrit web interface which shows diffstat
> like this, e.g. with commit 0433d533f1 (notice the "A" column on the
> third line):
>
>
> Documentation/merge-config.txt | 4 +
> builtin/merge.c | 2 +
> A t/t5573-pull-verify-signatures.sh | 81 ++++++++++++++++++
> t/t7612-merge-verify-signatures.sh | 45 ++++++++++
> 4 files changed, 132 insertions(+)
This feature is awesome. This has bothered me about --stat, but I
haven't done anything about it.
> In other words, certain information currently shown with --summary is
> embedded in the diffstat. This helps reading (all information of the
> same file in the same line instead of two) and can reduce the number of
> lines if you add/delete a lot of files.
Wait, isn't there a bug here in the existing --summary code, its
documentation says it'll show information "such as creations, renames
and mode changes".
But even though your --compact-summary shows that the file is being
added and its mode changed:
$ diff -ru <(./git-show --stat 0433d533f1) <(./git-show --stat --compact-summary 0433d533f1)
--- /dev/fd/63 2018-01-18 21:11:51.186570555 +0000
+++ /dev/fd/62 2018-01-18 21:11:51.186570555 +0000
@@ -14,8 +14,8 @@
t: add tests for pull --verify-signatures
merge: add config option for verifySignatures
- Documentation/merge-config.txt | 4 ++
- builtin/merge.c | 2 +
- t/t5573-pull-verify-signatures.sh | 81 ++++++++++++++++++++++++++++++++++++++
- t/t7612-merge-verify-signatures.sh | 45 +++++++++++++++++++++
+ Documentation/merge-config.txt | 4 ++
+ builtin/merge.c | 2 +
+ A+x t/t5573-pull-verify-signatures.sh | 81 ++++++++++++++++++++++++++++++++++
+ t/t7612-merge-verify-signatures.sh | 45 +++++++++++++++++++
4 files changed, 132 insertions(+)
There is no difference between --stat with and without --summary on the
same commit, shouldn't it show "create mode [...]" ?
E.g. 95450bbbaa will do the trick for both:
$ diff -ru <(./git-show --stat 95450bbbaa) <(./git-show --stat --summary 95450bbbaa)
--- /dev/fd/63 2018-01-18 21:14:20.770050599 +0000
+++ /dev/fd/62 2018-01-18 21:14:20.770050599 +0000
@@ -14,3 +14,4 @@
git-svn.perl | 1 +
t/t9169-git-svn-dcommit-crlf.sh | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
+ create mode 100755 t/t9169-git-svn-dcommit-crlf.sh
$ diff -ru <(./git-show --stat --summary 95450bbbaa) <(./git-show --stat --compact-summary 95450bbbaa)
--- /dev/fd/63 2018-01-18 21:14:30.646016210 +0000
+++ /dev/fd/62 2018-01-18 21:14:30.646016210 +0000
@@ -11,7 +11,6 @@
Reported-by: Brian Bennett <Brian.Bennett@Transamerica.com>
Signed-off-by: Eric Wong <e@80x24.org>
- git-svn.perl | 1 +
- t/t9169-git-svn-dcommit-crlf.sh | 27 +++++++++++++++++++++++++++
+ git-svn.perl | 1 +
+ A+x t/t9169-git-svn-dcommit-crlf.sh | 27 +++++++++++++++++++++++++++
2 files changed, 28 insertions(+)
- create mode 100755 t/t9169-git-svn-dcommit-crlf.sh
> +--compact-summary::
> + Output a condensed summary of extended header information in
> + front of the file name part of diffstat. This option is
> + ignored if --stat is not specified.
> ++
If for some reason the lack of information about the commit under
--summary isn't a bug/fixable it makes sense to document the differences
here.
> +File creations or deletions are denoted wigth "A" or "D" respectively,
s/wigth/with/
> +optionally "+l" if it's a symlink, or "+x" if it's executable.
> +Mode changes are shown "M+x" or "M-x" for adding or removing
"Mode changes are shown as" is better worded.
next prev parent reply other threads:[~2018-01-18 21:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-13 13:22 [PATCH/RFC] diff: add --compact-summary option to complement --stat Nguyễn Thái Ngọc Duy
2018-01-13 18:37 ` Philip Oakley
2018-01-14 9:37 ` Simon Ruderich
2018-01-14 10:24 ` Duy Nguyen
2018-01-18 10:05 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2018-01-18 18:57 ` Eric Sunshine
2018-01-19 0:01 ` Duy Nguyen
2018-01-18 21:23 ` Ævar Arnfjörð Bjarmason [this message]
2018-01-19 0:06 ` Duy Nguyen
2018-01-18 22:48 ` Jeff King
2018-01-19 0:26 ` Duy Nguyen
2018-01-19 21:52 ` Jeff King
2018-01-19 21:20 ` Junio C Hamano
2018-01-19 21:53 ` Jeff King
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=87bmhqj1y6.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@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.
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).