Re: [PATCH] t7800-difftool: don't accidentally match tmp dirs
From: Junio C Hamano <hidden>
Date: 2021-01-07 06:25:16
Possibly related (same subject, not in this thread)
- 2021-01-08 · Re: [PATCH] t7800-difftool: don't accidentally match tmp dirs · Junio C Hamano <hidden>
- 2020-12-24 · [PATCH] t7800-difftool: don't accidentally match tmp dirs · SZEDER Gábor <hidden>
SZEDER Gábor [off-list ref] writes:
quoted hunk
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 '