From: Michael J Gruber <git@drmicha•warpmail.net>
To: "Torsten Bögershausen" <tboegi@web•de>,
"Mårten Kongstad" <marten.kongstad@gmail•com>,
git@vger•kernel.org
Cc: gitster@pobox•com, johan@herland•net
Subject: Re: [PATCH v2] diff --shortstat --dirstat: remove duplicate output
Date: Sun, 01 Mar 2015 15:23:37 +0100 [thread overview]
Message-ID: <54F320E9.1000006@drmicha.warpmail.net> (raw)
In-Reply-To: <54F2E931.7020200@web.de>
Torsten Bögershausen venit, vidit, dixit 01.03.2015 11:25:
> On 2015-03-01 08.39, Mårten Kongstad wrote:
> []
> index ed7e093..128f7bf 100755
>> --- a/t/t4047-diff-dirstat.sh
>> +++ b/t/t4047-diff-dirstat.sh
>> @@ -973,4 +973,15 @@ test_expect_success 'diff.dirstat=future_param,0,lines should warn, but still wo
>> test_i18ngrep -q "diff\\.dirstat" actual_error
>> '
>>
>> +test_expect_success '--shortstat --dirstat should output only one dirstat' '
>> + git diff --shortstat --dirstat=changes HEAD^..HEAD >actual_diff_shortstat_dirstat_changes &&
>> + test $(grep -c " dst/copy/changed/$" actual_diff_shortstat_dirstat_changes) = 1 &&
> How portable is the "grep -c" usage ?
> (I don't now it either, do we have other opinions ?), but the following seems to be more "Git-style":
>
> test_expect_success '--shortstat --dirstat should output only one dirstat' '
> git diff --shortstat --dirstat=changes HEAD^..HEAD >actual_diff_shortstat_dirstat_changes &&
> grep " dst/copy/changed/$" actual_diff_shortstat_dirstat_changes >actual &&
> test_line_count = 1 actual
>
If I would have had to guess from the documentation: What does "git diff
--dirstat --shortstat" do? I would have answered: It displays both the
dirstat and the shortstat.
So, is what you are trying to "fix" a peculiarity of
"--dirstat=changes", or do you simplify prefer --dirstat and --shortstat
to override each other?
Maybe I'm overlooking something (and that's not a rhetorical
conditional), but if you specify both options when you want the output
of only one them, the answer would be the obvious one, not a patch,
wouldn't it?
If there is indeed a good reason to change the behavior it should be
documented.
Michael
next prev parent reply other threads:[~2015-03-01 14:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-28 13:19 [PATCH] diff --shortstat --dirstat: remove duplicate output Mårten Kongstad
2015-02-28 14:21 ` Johan Herland
2015-03-01 3:54 ` Junio C Hamano
2015-03-01 7:39 ` [PATCH v2] " Mårten Kongstad
2015-03-01 10:25 ` Torsten Bögershausen
2015-03-01 14:23 ` Michael J Gruber [this message]
2015-03-01 16:01 ` Mårten Kongstad
2015-03-01 16:08 ` Michael J Gruber
2015-03-01 15:58 ` Mårten Kongstad
2015-03-02 1:00 ` SZEDER Gábor
2015-03-02 15:05 ` [PATCH v3] " Mårten Kongstad
2015-03-05 21:38 ` Junio C Hamano
2015-03-04 9:07 ` [PATCH v2] " 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54F320E9.1000006@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johan@herland$(echo .)net \
--cc=marten.kongstad@gmail$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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