My Various Git Projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cd3065f
)
t7607: mark known breakage in test 11 as fixed
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>
t/t7607-merge-overwrite.sh
patch
|
blob
|
history
diff --git
a/t/t7607-merge-overwrite.sh
b/t/t7607-merge-overwrite.sh
index
5f731a1
..
691c5fd
100755
(executable)
--- 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 &&