diff options
Diffstat (limited to 't/t8020-last-modified.sh')
| -rwxr-xr-x | t/t8020-last-modified.sh | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/t/t8020-last-modified.sh b/t/t8020-last-modified.sh index 5eb4cef035..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,6 +127,27 @@ test_expect_success 'only last-modified files in the current tree' ' 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' ' git checkout HEAD^0 && git rm -rf . && |