summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cd3065f)
raw | patch | inline | side by side (parent: cd3065f)
author | Jeff King <peff@peff.net> | |
Fri, 25 Mar 2011 18:08:36 +0000 (14:08 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 25 Mar 2011 21:12:00 +0000 (14:12 -0700) |
This was fixed by 1d718a51 (do not overwrite untracked
symlinks, 2011-02-20).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
symlinks, 2011-02-20).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7607-merge-overwrite.sh | patch | blob | history |
index 5f731a1177267e76f19dbe1605a4d0f2e8e749bd..691c5fda30e8d40b122200a55debd3e0e3241f3b 100755 (executable)
rm -f sub sub2
'
-test_expect_failure SYMLINKS 'will not overwrite untracked symlink in leading path' '
+test_expect_success SYMLINKS 'will not overwrite untracked symlink in leading path' '
git reset --hard c0 &&
rm -rf sub &&
mkdir sub2 &&