Merge branch 'js/checkout-untracked-symlink' into maint * js/checkout-untracked-symlink: t2021: mark a test as fixed