Merge branch 'sg/t7800-difftool-robustify'

[thirdparty/git.git] / t / t7800-difftool.sh

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index a578b35761f2e97177dd8342ff5d949e719b64d3..9192c141ffc618f70e15b7cf25883d55469e5c11 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -8,6 +8,9 @@ test_description='git-difftool
 Testing basic diff tool invocation
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 difftool_test_setup ()
@@ -35,23 +38,23 @@ test_expect_success 'basic usage requires no repo' '
        test_i18ngrep ^usage: output
 '
 
-# Create a file on master and change it on branch
+# Create a file on main and change it on branch
 test_expect_success 'setup' '
-       echo master >file &&
+       echo main >file &&
        git add file &&
        git commit -m "added file" &&
 
-       git checkout -b branch master &&
+       git checkout -b branch main &&
        echo branch >file &&
        git commit -a -m "branch changed file" &&
-       git checkout master
+       git checkout main
 '
 
 # Configure a custom difftool.<tool>.cmd and use it
 test_expect_success 'custom commands' '
        difftool_test_setup &&
        test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" &&
-       echo master >expect &&
+       echo main >expect &&
        git difftool --no-prompt branch >actual &&
        test_cmp expect actual &&
 
@@ -63,7 +66,7 @@ test_expect_success 'custom commands' '
 
 test_expect_success 'custom tool commands override built-ins' '
        test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
-       echo master >expect &&
+       echo main >expect &&
        git difftool --tool vimdiff --no-prompt branch >actual &&
        test_cmp expect actual
 '
@@ -311,21 +314,21 @@ test_expect_success 'difftool.<tool>.path' '
 
 test_expect_success 'difftool --extcmd=cat' '
        echo branch >expect &&
-       echo master >>expect &&
+       echo main >>expect &&
        git difftool --no-prompt --extcmd=cat branch >actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'difftool --extcmd cat' '
        echo branch >expect &&
-       echo master >>expect &&
+       echo main >>expect &&
        git difftool --no-prompt --extcmd=cat branch >actual &&
        test_cmp expect actual
 '
 
 test_expect_success 'difftool -x cat' '
        echo branch >expect &&
-       echo master >>expect &&
+       echo main >>expect &&
        git difftool --no-prompt -x cat branch >actual &&
        test_cmp expect actual
 '
@@ -338,7 +341,7 @@ test_expect_success 'difftool --extcmd echo arg1' '
 '
 
 test_expect_success 'difftool --extcmd cat arg1' '
-       echo master >expect &&
+       echo main >expect &&
        git difftool --no-prompt \
                --extcmd sh\ -c\ \"cat\ \$1\" branch >actual &&
        test_cmp expect actual
@@ -351,7 +354,7 @@ test_expect_success 'difftool --extcmd cat arg2' '
        test_cmp expect actual
 '
 
-# Create a second file on master and a different version on branch
+# Create a second file on main and a different version on branch
 test_expect_success 'setup with 2 files different' '
        echo m2 >file2 &&
        git add file2 &&
@@ -361,7 +364,7 @@ test_expect_success 'setup with 2 files different' '
        echo br2 >file2 &&
        git add file2 &&
        git commit -a -m "branch changed file2" &&
-       git checkout master
+       git checkout main
 '
 
 test_expect_success 'say no to the first file' '
@@ -369,14 +372,14 @@ test_expect_success 'say no to the first file' '
        git difftool -x cat branch <input >output &&
        grep m2 output &&
        grep br2 output &&
-       ! grep master output &&
+       ! grep main output &&
        ! grep branch output
 '
 
 test_expect_success 'say no to the second file' '
        (echo && echo n) >input &&
        git difftool -x cat branch <input >output &&
-       grep master output &&
+       grep main output &&
        grep branch output &&
        ! grep m2 output &&
        ! grep br2 output
@@ -384,7 +387,7 @@ test_expect_success 'say no to the second file' '
 
 test_expect_success 'ending prompt input with EOF' '
        git difftool -x cat branch </dev/null >output &&
-       ! grep master output &&
+       ! grep main output &&
        ! grep branch output &&
        ! grep m2 output &&
        ! grep br2 output
@@ -396,9 +399,9 @@ test_expect_success 'difftool --tool-help' '
 '
 
 test_expect_success 'setup change in subdirectory' '
-       git checkout master &&
+       git checkout main &&
        mkdir sub &&
-       echo master >sub/sub &&
+       echo main >sub/sub &&
        git add sub/sub &&
        git commit -m "added sub/sub" &&
        git tag v1 &&
@@ -440,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' '
@@ -462,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
        )
 '
@@ -477,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
        )
 '
 
@@ -491,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
        )
 '
 
@@ -503,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
        )
 '
 
@@ -518,16 +521,16 @@ 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
        )
 '
 
 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 &&
-       grep file2 output
+       git difftool --dir-diff $symlinks --extcmd ls branch main >output &&
+       grep "^file2$" output
 '
 
 run_dir_diff_test 'difftool --dir-diff with unmerged files' '
@@ -543,7 +546,7 @@ run_dir_diff_test 'difftool --dir-diff with unmerged files' '
        echo b >>file &&
        git add file &&
        git commit -m conflict-b &&
-       git checkout master &&
+       git checkout main &&
        git merge conflict-a &&
        test_must_fail git merge conflict-b &&
        cat >expect <<-EOF &&