From: Johannes Sixt <j6t@xxxxxxxx> The failure was fixed by 1d718a51 (do not overwrite untracked symlinks). Signed-off-by: Johannes Sixt <j6t@xxxxxxxx> --- You might want to place this onto topic js/checkout-untracked-symlink and rewrite the commit message to: The failure was fixed in the previous commit. -- Hannes t/t2021-checkout-overwrite.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh index 27db2ad..5da63e9 100755 --- a/t/t2021-checkout-overwrite.sh +++ b/t/t2021-checkout-overwrite.sh @@ -39,7 +39,7 @@ test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' git commit -m "dir to symlink" ' -test_expect_failure SYMLINKS 'checkout commit with dir must not remove untracked a/b' ' +test_expect_success SYMLINKS 'checkout commit with dir must not remove untracked a/b' ' git rm --cached a/b && git commit -m "un-track the symlink" && -- 1.7.4.1.317.g0b25 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html