From: Jeff King <peff@peff.net>
To: "igor.mikushkin" <igor.mikushkin@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Clemens Buchacher <drizzd@aon.at>,
git@vger.kernel.org
Subject: [PATCH 1/4] t7607: mark known breakage in test 11 as fixed
Date: Fri, 25 Mar 2011 14:08:36 -0400 [thread overview]
Message-ID: <20110325180836.GA14898@sigill.intra.peff.net> (raw)
In-Reply-To: <20110325180644.GA30838@sigill.intra.peff.net>
This was fixed by 1d718a51 (do not overwrite untracked
symlinks, 2011-02-20).
Signed-off-by: Jeff King <peff@peff.net>
---
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 5f731a1..691c5fd 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 &&
--
1.7.4.33.gb8855.dirty
next prev parent reply other threads:[~2011-03-25 18:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-25 14:52 Why git silently replaces untracked files? igor.mikushkin
2011-03-25 16:58 ` Jeff King
2011-03-25 17:53 ` igor.mikushkin
2011-03-25 18:06 ` Jeff King
2011-03-25 18:08 ` Jeff King [this message]
2011-03-25 18:09 ` [PATCH 2/4] t7607: clean up stray untracked file Jeff King
2011-03-25 18:10 ` [PATCH 3/4] merge: merge unborn index before setting ref Jeff King
2011-03-25 18:13 ` [PATCH 4/4] pull: do not clobber untracked files on initial pull Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110325180836.GA14898@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=igor.mikushkin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).