From: Junio C Hamano <gitster@pobox•com>
To: "SZEDER Gábor" <szeder.dev@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] t7800-difftool: don't accidentally match tmp dirs
Date: Wed, 06 Jan 2021 22:24:27 -0800 [thread overview]
Message-ID: <xmqq35zdnu1w.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201224092431.13354-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Thu, 24 Dec 2020 10:24:31 +0100")
SZEDER Gábor <szeder.dev@gmail•com> writes:
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index a578b35761..fe02fe1688 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -439,73 +439,104 @@ run_dir_diff_test () {
> }
>
> run_dir_diff_test 'difftool -d' '
> + cat >expect <<-\EOF &&
> + file
> + file2
> +
> + file
> + file2
> + sub
> + EOF
> git difftool -d $symlinks --extcmd ls branch >output &&
> - grep sub output &&
> - grep file output
> + grep -v ^/ output >actual &&
This unfortunately would not catch full paths on certain platforms.
See https://github.com/git/git/runs/1660588243?check_suite_focus=true#step:7:4186
for an example X-<.
> + test_cmp expect actual
> '
next prev parent reply other threads:[~2021-01-07 6:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-24 9:24 [PATCH] t7800-difftool: don't accidentally match tmp dirs SZEDER Gábor
2021-01-07 6:24 ` Junio C Hamano [this message]
2021-01-08 9:20 ` SZEDER Gábor
2021-01-08 15:23 ` Johannes Schindelin
2021-01-08 20:10 ` Junio C Hamano
2021-01-09 17:05 ` [PATCH v2] " SZEDER Gábor
2021-01-09 21:40 ` Junio C Hamano
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=xmqq35zdnu1w.fsf@gitster.c.googlers.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=szeder.dev@gmail$(echo .)com \
/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