diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-10 12:51:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-10 12:51:46 -0700 |
| commit | ffa7a4331af576be0e5d51969837f89824a14c7f (patch) | |
| tree | 791e0db3d0de5010d3153a13a478f4c6c3afe12f /t | |
| parent | 60f3f52f17cceefa5299709b189ce6fe2d181e7b (diff) | |
| parent | 3c4925c3f5dbafec2c0c9b3b7ac7d9086618a18f (diff) | |
| download | git-ffa7a4331af576be0e5d51969837f89824a14c7f.tar.gz | |
Merge branch 'ps/gitlab-ci-windows-improvements'
GitLab CI improvements.
* ps/gitlab-ci-windows-improvements:
t8020: fix test failure due to indeterministic tag sorting
gitlab-ci: upload Meson test logs as JUnit reports
gitlab-ci: drop workaround for Python certificate store on Windows
gitlab-ci: ignore failures to disable realtime monitoring
gitlab-ci: dedup instructions to disable realtime monitoring
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8020-last-modified.sh | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh index e13aad1439..61f00bc15c 100755 --- a/t/t8020-last-modified.sh +++ b/t/t8020-last-modified.sh @@ -33,7 +33,6 @@ check_last_modified() { done && cat >expect && - test_when_finished "rm -f tmp.*" && git ${indir:+-C "$indir"} last-modified "$@" >tmp.1 && git name-rev --annotate-stdin --name-only --tags \ <tmp.1 >tmp.2 && @@ -128,20 +127,25 @@ test_expect_success 'only last-modified files in the current tree' ' EOF ' -test_expect_success 'last-modified with subdir and criss-cross merge' ' - git checkout -b branch-k1 1 && - mkdir -p a k && - test_commit k1 a/file2 && - git checkout -b branch-k2 && - test_commit k2 k/file2 && - git checkout branch-k1 && - test_merge km2 branch-k2 && - test_merge km3 3 && - check_last_modified <<-\EOF - km3 a - k2 k - 1 file - EOF +test_expect_success 'subdirectory modified via merge' ' + test_when_finished rm -rf repo && + git init repo && + ( + cd repo && + test_commit base && + git switch --create left && + mkdir subdir && + test_commit left subdir/left && + git switch --create right base && + mkdir subdir && + test_commit right subdir/right && + git switch - && + test_merge merge right && + check_last_modified <<-\EOF + merge subdir + base base.t + EOF + ) ' test_expect_success 'cross merge boundaries in blaming' ' |