git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Barret Rhoden <brho@google.com>
Cc: git@vger.kernel.org, "Michael Platings" <michael@platin.gs>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"David Kastrup" <dak@gnu.org>, "Jeff King" <peff@peff.net>,
	"Jeff Smith" <whydoubt@gmail.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Junio C Hamano" <gitster@pobox.com>,
	"René Scharfe" <l.s.r@web.de>,
	"Stefan Beller" <stefanbeller@gmail.com>
Subject: Re: [PATCH v8 7/9] blame: add a fingerprint heuristic to match ignored lines
Date: Thu, 13 Jun 2019 17:17:56 +0200	[thread overview]
Message-ID: <20190613151756.GA31952@szeder.dev> (raw)
In-Reply-To: <20190610153014.42055-8-brho@google.com>

On Mon, Jun 10, 2019 at 11:30:12AM -0400, Barret Rhoden wrote:
> diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
> new file mode 100755
> index 000000000000..1d8fa1da74c9
> --- /dev/null
> +++ b/t/t8014-blame-ignore-fuzzy.sh

> +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"
> +done
> +
> +# This invoked a null pointer dereference when the chunk callback was called
> +# with a zero length parent chunk and there were no more suspects.
> +test_expect_success 'Diff chunks with no suspects' '
> +	test_write_lines xy1 A B C xy1 >file &&
> +	git add file &&
> +	test_tick &&
> +	GIT_AUTHOR_NAME=1 git commit -m 1 &&
> +
> +	test_write_lines xy2 A B xy2 C xy2 >file &&
> +	git add file &&
> +	test_tick &&
> +	GIT_AUTHOR_NAME=2 git commit -m 2 &&
> +	REV_2=$(git rev-parse HEAD) &&
> +
> +	test_write_lines xy3 A >file &&
> +	git add file &&
> +	test_tick &&
> +	GIT_AUTHOR_NAME=3 git commit -m 3 &&
> +	REV_3=$(git rev-parse HEAD) &&
> +
> +	test_write_lines 1 1 >expected &&
> +
> +	git blame --ignore-rev $REV_2 --ignore-rev $REV_3 file | sed -e "$pick_author" >actual &&

Please use an intermediate file between 'git blame' and the downstream
'sed' command, here and in other tests as well.

This test script focuses specifically on 'git blame', but that pipe
hides its exit code.


  reply	other threads:[~2019-06-13 15:18 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 [this message]
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
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=20190613151756.GA31952@szeder.dev \
    --to=szeder.dev@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=avarab@gmail.com \
    --cc=brho@google.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=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).