diff options
| author | Jeff King <peff@peff.net> | 2011-03-25 14:08:36 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-25 14:12:00 -0700 |
| commit | 8523d071ad350539ab0f7e6efe192b8530320962 (patch) | |
| tree | 45a17022f7a3ff8ced266ea67b67ef8e200c5e9b /t/t7607-merge-overwrite.sh | |
| parent | cd3065f9e3c27594a91540e971d147f1acba89de (diff) | |
| download | git-8523d071ad350539ab0f7e6efe192b8530320962.tar.gz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7607-merge-overwrite.sh')
| -rwxr-xr-x | t/t7607-merge-overwrite.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh index 5f731a1177..691c5fda30 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 && |