From: Jeff King Date: Fri, 25 Mar 2011 18:08:36 +0000 (-0400) Subject: t7607: mark known breakage in test 11 as fixed X-Git-Tag: v1.7.5-rc0~27 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8523d071ad350539ab0f7e6efe192b8530320962;p=git.git t7607: mark known breakage in test 11 as fixed This was fixed by 1d718a51 (do not overwrite untracked symlinks, 2011-02-20). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 5f731a117..691c5fda3 100755 --- a/t/t7607-merge-overwrite.sh +++ b/t/t7607-merge-overwrite.sh @@ -122,7 +122,7 @@ test_expect_success 'will not overwrite untracked file in leading path' ' 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 &&