oneway_merge(): only lstat() when told to update worktree

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index bd8335580d0fa02e0c7e1b9b1459cac37050ed44..b3ac6be3b0d2cc47af4559bcf7401ef858dae322 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -816,4 +816,11 @@ test_expect_success 'log --graph with diff and stats' '
        test_cmp expect actual.sanitized
 '
 
+test_expect_success 'dotdot is a parent directory' '
+       mkdir -p a/b &&
+       ( echo sixth && echo fifth ) >expect &&
+       ( cd a/b && git log --format=%s .. ) >actual &&
+       test_cmp expect actual
+'
+
 test_done