From: Barret Rhoden <brho@google.com>
To: michael@platin.gs, git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Stefan Beller" <stefanbeller@gmail.com>,
"Jeff Smith" <whydoubt@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"René Scharfe" <l.s.r@web.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"David Kastrup" <dak@gnu.org>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH] t8014: avoid git command in upstream pipe
Date: Mon, 17 Jun 2019 11:03:37 -0400 [thread overview]
Message-ID: <91d5a68d-6d63-5f1a-af9c-ba857a1f9daa@google.com> (raw)
In-Reply-To: <20190616204441.5400-1-michael@platin.gs>
On 6/16/19 4:44 PM, michael@platin.gs wrote:
> From: Michael Platings <michael@platin.gs>
>
> Use an intermediate file between between git blame and sed to avoid
> git blame's exit code being hidden.
Thanks, Michael. I'll squash this for the next version.
Barret
>
> Signed-off-by: Michael Platings <michael@platin.gs>
> ---
> t/t8014-blame-ignore-fuzzy.sh | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
> index 1ff59624e9..6f1a94caef 100755
> --- a/t/t8014-blame-ignore-fuzzy.sh
> +++ b/t/t8014-blame-ignore-fuzzy.sh
> @@ -332,7 +332,9 @@ test_expect_success setup '
> for i in $(test_seq 2 $last_test); do
> eval title="\$title$i"
> test_expect_success "$title" \
> - "git blame -M9 --ignore-rev $IGNOREME $i | sed -e \"$pick_author\" >actual && test_cmp expected$i actual"
> + "git blame -M9 --ignore-rev $IGNOREME $i >output &&
> + sed -e \"$pick_author\" output >actual &&
> + test_cmp expected$i actual"
> done
>
> # This invoked a null pointer dereference when the chunk callback was called
> @@ -357,7 +359,8 @@ test_expect_success 'Diff chunks with no suspects' '
>
> test_write_lines 1 1 >expected &&
>
> - git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file | sed -e "$pick_author" >actual &&
> + git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file >output &&
> + sed -e "$pick_author" output >actual &&
>
> test_cmp expected actual
> '
> @@ -387,7 +390,8 @@ test_expect_success 'position matching' '
>
> test_write_lines 1 1 2 2 >expected &&
>
> - git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 | sed -e "$pick_author" >actual &&
> + git blame --ignore-rev $REV_3 --ignore-rev $REV_4 file2 >output &&
> + sed -e "$pick_author" output >actual &&
>
> test_cmp expected actual
> '
> @@ -424,7 +428,8 @@ test_expect_success 'preserve order' '
>
> test_write_lines 1 2 3 >expected &&
>
> - git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 | sed -e "$pick_author" >actual &&
> + git blame --ignore-rev $REV_4 --ignore-rev $REV_5 file3 >output &&
> + sed -e "$pick_author" output >actual &&
>
> test_cmp expected actual
> '
>
next prev parent reply other threads:[~2019-06-17 15:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 15:30 [PATCH v8 0/9] blame: add the ability to ignore commits Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 1/9] fsck: rename and touch up init_skiplist() Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 2/9] Move oidset_parse_file() to oidset.c Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 3/9] blame: use a helper function in blame_chunk() Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 4/9] blame: add the ability to ignore commits and their changes Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 5/9] blame: add config options for the output of ignored or unblamable lines Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 6/9] blame: optionally track line fingerprints during fill_blame_origin() Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 7/9] blame: add a fingerprint heuristic to match ignored lines Barret Rhoden
2019-06-13 15:17 ` SZEDER Gábor
2019-06-13 16:38 ` Junio C Hamano
2019-06-16 20:44 ` [PATCH] t8014: avoid git command in upstream pipe michael
2019-06-17 15:03 ` Barret Rhoden [this message]
2019-06-10 15:30 ` [PATCH v8 8/9] blame: use the fingerprint heuristic to match ignored lines Barret Rhoden
2019-06-10 15:30 ` [PATCH v8 9/9] blame: add a test to cover blame_coalesce() Barret Rhoden
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=91d5a68d-6d63-5f1a-af9c-ba857a1f9daa@google.com \
--to=brho@google.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=michael@platin.gs \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
--cc=szeder.dev@gmail.com \
--cc=whydoubt@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).