From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Clemens Buchacher <drizzd@aon.at>, git@vger.kernel.org
Subject: Re: [PATCH] Demonstrate breakage: checkout overwrites untracked symlink with directory
Date: Tue, 15 Feb 2011 08:24:36 +0100 [thread overview]
Message-ID: <4D5A2A34.7090008@viscovery.net> (raw)
In-Reply-To: <201102051918.44848.j6t@kdbg.org>
I forgot to test the patch on Windows.. Would you please squash this
into js/checkout-untracked-symlink~1 ?
Thanks a lot!
--- 8< ---
From: Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH] fixup! Make test case number unique, mark tests with SYMLINKS prerequisite
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
...ut-overwrite.sh => t2021-checkout-overwrite.sh} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename t/{t2019-checkout-overwrite.sh => t2021-checkout-overwrite.sh} (83%)
diff --git a/t/t2019-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
similarity index 83%
rename from t/t2019-checkout-overwrite.sh
rename to t/t2021-checkout-overwrite.sh
index e4e529d..27db2ad 100755
--- a/t/t2019-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -29,7 +29,7 @@ test_expect_success 'checkout commit with dir must not remove untracked a/b' '
test -f a/b
'
-test_expect_success 'create a commit where dir a/b changed to symlink' '
+test_expect_success SYMLINKS 'create a commit where dir a/b changed to symlink' '
rm -rf a/b && # cleanup if previous test failed
git checkout -f -b symlink start &&
@@ -39,7 +39,7 @@ test_expect_success 'create a commit where dir a/b changed to symlink' '
git commit -m "dir to symlink"
'
-test_expect_failure 'checkout commit with dir must not remove untracked a/b' '
+test_expect_failure SYMLINKS 'checkout commit with dir must not remove untracked a/b' '
git rm --cached a/b &&
git commit -m "un-track the symlink" &&
--
1.7.4.2.gb816c.dirty
prev parent reply other threads:[~2011-02-15 7:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-02 19:25 untracked symlinks are less precious than untracked files? Johannes Sixt
2011-02-02 20:03 ` Junio C Hamano
2011-02-02 22:24 ` Johannes Sixt
2011-02-05 18:18 ` [PATCH] Demonstrate breakage: checkout overwrites untracked symlink with directory Johannes Sixt
2011-02-05 18:33 ` Clemens Buchacher
2011-02-09 23:48 ` Junio C Hamano
2011-02-10 21:49 ` Clemens Buchacher
2011-02-20 12:13 ` [PATCH] do not overwrite untracked symlinks Clemens Buchacher
2011-02-21 7:15 ` Junio C Hamano
2011-02-21 19:46 ` Clemens Buchacher
2011-02-22 6:54 ` Junio C Hamano
2011-02-22 19:26 ` Clemens Buchacher
2011-02-22 20:01 ` Junio C Hamano
2011-02-15 7:24 ` Johannes Sixt [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D5A2A34.7090008@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).