kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sg/t7800-difftool-robustify' 

Test fix.

* sg/t7800-difftool-robustify:
  t7800-difftool: don't accidentally match tmp dirs
maint
Junio C Hamano 2021-02-10 14:48:32 -08:00
parent c9f94ab4fa e3f5da7e60
commit 04703f64be
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
t/t7800-difftool.sh
View File

@ -443,20 +443,20 @@ run_dir_diff_test () {

run_dir_diff_test 'difftool -d' '
git difftool -d $symlinks --extcmd ls branch >output &&
grep sub output &&
grep file output
grep "^sub$" output &&
grep "^file$" output
'

run_dir_diff_test 'difftool --dir-diff' '
git difftool --dir-diff $symlinks --extcmd ls branch >output &&
grep sub output &&
grep file output
grep "^sub$" output &&
grep "^file$" output
'

run_dir_diff_test 'difftool --dir-diff ignores --prompt' '
git difftool --dir-diff $symlinks --prompt --extcmd ls branch >output &&
grep sub output &&
grep file output
grep "^sub$" output &&
grep "^file$" output
'

run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
@ -465,11 +465,11 @@ run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
git difftool --dir-diff $symlinks --extcmd ls branch >output &&
# "sub" must only exist in "right"
# "file" and "file2" must be listed in both "left" and "right"
grep sub output >sub-output &&
grep "^sub$" output >sub-output &&
test_line_count = 1 sub-output &&
grep file"$" output >file-output &&
grep "^file$" output >file-output &&
test_line_count = 2 file-output &&
grep file2 output >file2-output &&
grep "^file2$" output >file2-output &&
test_line_count = 2 file2-output
)
'
@ -480,11 +480,11 @@ run_dir_diff_test 'difftool --dir-diff v1 from subdirectory' '
git difftool --dir-diff $symlinks --extcmd ls v1 >output &&
# "sub" and "file" exist in both v1 and HEAD.
# "file2" is unchanged.
grep sub output >sub-output &&
grep "^sub$" output >sub-output &&
test_line_count = 2 sub-output &&
grep file output >file-output &&
grep "^file$" output >file-output &&
test_line_count = 2 file-output &&
! grep file2 output
! grep "^file2$" output
)
'

@ -494,9 +494,9 @@ run_dir_diff_test 'difftool --dir-diff branch from subdirectory w/ pathspec' '
git difftool --dir-diff $symlinks --extcmd ls branch -- .>output &&
# "sub" only exists in "right"
# "file" and "file2" must not be listed
grep sub output >sub-output &&
grep "^sub$" output >sub-output &&
test_line_count = 1 sub-output &&
! grep file output
! grep "^file$" output
)
'

@ -506,9 +506,9 @@ run_dir_diff_test 'difftool --dir-diff v1 from subdirectory w/ pathspec' '
git difftool --dir-diff $symlinks --extcmd ls v1 -- .>output &&
# "sub" exists in v1 and HEAD
# "file" is filtered out by the pathspec
grep sub output >sub-output &&
grep "^sub$" output >sub-output &&
test_line_count = 2 sub-output &&
! grep file output
! grep "^file$" output
)
'

@ -521,8 +521,8 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory with GIT_DIR set' '
cd sub &&
git difftool --dir-diff $symlinks --extcmd ls \
branch -- sub >output &&
grep sub output &&
! grep file output
grep "^sub$" output &&
! grep "^file$" output
)
'

@ -530,7 +530,7 @@ 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 main >output &&
grep file2 output
grep "^file2$" output
'

run_dir_diff_test 'difftool --dir-diff with unmerged files' '