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

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index f63333b64e2984c609bde2a562bfcdbf05f8b88e..81005373d728f09e1a9289048cc721a0300f1cf9 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -159,7 +159,7 @@ test_expect_success 'tracking count is accurate after orphan check' '
        git config branch.child.merge refs/heads/master &&
        git checkout child^ &&
        git checkout child >stdout &&
-       test_cmp expect stdout
+       test_i18ncmp expect stdout
 '
 
 test_done