diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-01-15 07:12:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-01-15 07:12:40 -0800 |
| commit | c0453835ab4d507a48d536f8a6352ef03bcbd464 (patch) | |
| tree | 70b9419b955ee2b1ba47bf330cd9e8a340218d4e | |
| parent | 8745eae506f700657882b9e32b2aa00f234a6fb6 (diff) | |
| parent | 0b495cd390ec39045542f6fcae53ce64264301b7 (diff) | |
| download | git-c0453835ab4d507a48d536f8a6352ef03bcbd464.tar.gz git-c0453835ab4d507a48d536f8a6352ef03bcbd464.zip | |
Merge branch 'pt/t7800-difftool-test-racefix'
Test fixup.
* pt/t7800-difftool-test-racefix:
t7800: fix racy "difftool --dir-diff syncs worktree" test
| -rwxr-xr-x | t/t7800-difftool.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index bf0f67378d..8a91ff3603 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -647,21 +647,21 @@ test_expect_success SYMLINKS 'difftool --dir-diff --symlinks without unstaged ch ' write_script modify-right-file <<\EOF -echo "new content" >"$2/file" +echo "modified content" >"$2/file" EOF run_dir_diff_test 'difftool --dir-diff syncs worktree with unstaged change' ' test_when_finished git reset --hard && echo "orig content" >file && git difftool -d $symlinks --extcmd "$PWD/modify-right-file" branch && - echo "new content" >expect && + echo "modified content" >expect && test_cmp expect file ' run_dir_diff_test 'difftool --dir-diff syncs worktree without unstaged change' ' test_when_finished git reset --hard && git difftool -d $symlinks --extcmd "$PWD/modify-right-file" branch && - echo "new content" >expect && + echo "modified content" >expect && test_cmp expect file ' |