From: "Mårten Kongstad" <marten.kongstad@gmail•com>
To: "Torsten Bögershausen" <tboegi@web•de>, git@vger•kernel.org
Cc: gitster@pobox•com, johan@herland•net, marten.kongstad@gmail•com
Subject: Re: [PATCH v2] diff --shortstat --dirstat: remove duplicate output
Date: Sun, 1 Mar 2015 16:58:18 +0100 [thread overview]
Message-ID: <20150301155818.GA5307@laptop> (raw)
In-Reply-To: <54F2E931.7020200@web.de>
On Sun, Mar 01, 2015 at 11:25:53AM +0100, Torsten Bögershausen wrote:
> On 2015-03-01 08.39, Mårten Kongstad wrote:
> []
> > +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
>
From what I can see, both 'grep -c' and 'grep >file && test_line_count'
are used in the tests.
'grep -c' is used in these tests:
- t3404-rebase-interactive.sh
- t3507-cherry-pick-conflict.sh
- t4036-format-patch-signer-mime.sh
- t4150-am.sh
- t7810-grep.sh
- t8003-blame-corner-cases.sh
- t9350-fast-export.sh
'grep >file && test_line_count' is used in this test:
- t9400-git-cvsserver-server.sh
And to make matters more confusing, both 'grep -c' and 'grep >file &&
test_line_count' is used in this test:
- t9001-send-email.sh
Granted I didn't miss anything while trawling the tests for the above
numbers, it feels like the 'grep -c' option is more in line with the
existing tests. That said, I don't know if there is an ongoing trend to
deprecate 'grep -c' in favour of 'test_line_count'.
next prev parent reply other threads:[~2015-03-01 15:58 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
2015-03-01 16:01 ` Mårten Kongstad
2015-03-01 16:08 ` Michael J Gruber
2015-03-01 15:58 ` Mårten Kongstad [this message]
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=20150301155818.GA5307@laptop \
--to=marten.kongstad@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johan@herland$(echo .)net \
--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