From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2021 22:48:32 +0000 (-0800)
Subject: Merge branch 'sg/t7800-difftool-robustify'
X-Git-Tag: v2.31.0-rc0~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04703f64bee1b126b99d5eded0c7b954aa5abfbe;p=thirdparty%2Fgit.git

Merge branch 'sg/t7800-difftool-robustify'

Test fix.

* sg/t7800-difftool-robustify:
  t7800-difftool: don't accidentally match tmp dirs
---

04703f64bee1b126b99d5eded0c7b954aa5abfbe
diff --cc t/t7800-difftool.sh
index 9662abc1e7,d118fdb98b..9192c141ff
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@@ -529,8 -526,8 +529,8 @@@ run_dir_diff_test 'difftool --dir-diff 
  run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
  	test_when_finished git reset --hard &&
  	rm file2 &&
 -	git difftool --dir-diff $symlinks --extcmd ls branch master >output &&
 +	git difftool --dir-diff $symlinks --extcmd ls branch main >output &&
- 	grep file2 output
+ 	grep "^file2$" output
  '
  
  run_dir_diff_test 'difftool --dir-diff with unmerged files' '