From: Daniel Ferreira <bnmvco@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, sbeller@google.com, pclouds@gmail.com,
mhagger@alum.mit.edu, Daniel Ferreira <bnmvco@gmail.com>
Subject: [PATCH v11 2/5] remove_subtree(): test removing nested directories
Date: Wed, 26 Apr 2017 10:03:36 -0700 [thread overview]
Message-ID: <1493226219-33423-3-git-send-email-bnmvco@gmail.com> (raw)
In-Reply-To: <1493226219-33423-1-git-send-email-bnmvco@gmail.com>
Test removing a nested directory when an attempt is made to restore the
index to a state where it does not exist. A similar test could be found
previously in t/t2000-checkout-cache-clash.sh, but it did not check for
nested directories, which could allow a faulty implementation of
remove_subtree() pass the tests.
Signed-off-by: Daniel Ferreira <bnmvco@gmail.com>
---
t/t2000-checkout-cache-clash.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/t/t2000-checkout-cache-clash.sh b/t/t2000-checkout-cache-clash.sh
index de3edb5..ac10ba3 100755
--- a/t/t2000-checkout-cache-clash.sh
+++ b/t/t2000-checkout-cache-clash.sh
@@ -57,4 +57,15 @@ test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '
git checkout-index -a -f --prefix=there/
'
+test_expect_success 'git checkout-index -f should remove nested subtrees' '
+ echo content >path &&
+ git update-index --add path &&
+ rm path &&
+ mkdir -p path/with/nested/paths &&
+ echo content >path/file1 &&
+ echo content >path/with/nested/paths/file2 &&
+ git checkout-index -f -a &&
+ test ! -d path
+'
+
test_done
--
2.7.4 (Apple Git-66)
next prev parent reply other threads:[~2017-04-26 17:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 17:03 [PATCH v11 0/5] [GSoC] remove_subtree(): reimplement using iterators Daniel Ferreira
2017-04-26 17:03 ` [PATCH v11 1/5] dir_iterator: add tests for dir_iterator API Daniel Ferreira
2017-04-26 17:03 ` Daniel Ferreira [this message]
2017-04-26 17:03 ` [PATCH v11 3/5] dir_iterator: refactor dir_iterator_advance Daniel Ferreira
2017-04-26 17:03 ` [PATCH v11 4/5] dir_iterator: rewrite state machine model Daniel Ferreira
2017-04-26 17:03 ` [PATCH v11 5/5] remove_subtree(): reimplement using iterators Daniel Ferreira
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=1493226219-33423-3-git-send-email-bnmvco@gmail.com \
--to=bnmvco@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=sbeller@google.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).