From: Kyle Meyer <kyle@kyleam.com>
To: git@vger.kernel.org
Cc: debian@onerussian.com, Kyle Meyer <kyle@kyleam.com>
Subject: [PATCH 2/4] t3000: move non-submodule repo test to separate file
Date: Thu, 14 Mar 2019 11:02:17 -0400 [thread overview]
Message-ID: <20190314150219.2040-3-kyle@kyleam.com> (raw)
In-Reply-To: <20190314150219.2040-1-kyle@kyleam.com>
a2d5156c2b (resolve_gitlink_ref: ignore non-repository paths,
2016-01-22) added a test to t3000-ls-files-others.sh to check that
'ls-files -o' does not die() when given a subdirectory that looks like
a repository but is actually a subdirectory containing a bogus .git
file.
Move this test to a separate file in preparation for testing scenarios
with non-submodule repositories that are not bogus.
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
t/t3000-ls-files-others.sh | 7 -------
t/t3009-ls-files-others-nonsubmodule.sh | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 7 deletions(-)
create mode 100755 t/t3009-ls-files-others-nonsubmodule.sh
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index afd4756134..b4f9fc4580 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -65,13 +65,6 @@ test_expect_success '--no-empty-directory hides empty directory' '
test_cmp expected3 output
'
-test_expect_success 'ls-files --others handles non-submodule .git' '
- mkdir not-a-submodule &&
- echo foo >not-a-submodule/.git &&
- git ls-files -o >output &&
- test_cmp expected1 output
-'
-
test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
git init super &&
git init sub &&
diff --git a/t/t3009-ls-files-others-nonsubmodule.sh b/t/t3009-ls-files-others-nonsubmodule.sh
new file mode 100755
index 0000000000..cc66a4a14d
--- /dev/null
+++ b/t/t3009-ls-files-others-nonsubmodule.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+test_description='test git ls-files --others with non-submodule repositories'
+
+. ./test-lib.sh
+
+test_expect_success 'setup: expected output' '
+ cat >expected <<-EOF
+ expected
+ output
+ EOF
+'
+
+test_expect_success 'ls-files --others handles non-submodule .git' '
+ mkdir not-a-submodule &&
+ echo foo >not-a-submodule/.git &&
+ git ls-files -o >output &&
+ test_cmp expected output
+'
+
+test_done
--
2.21.0
next prev parent reply other threads:[~2019-03-14 15:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 15:02 [PATCH 0/4] dir: Treat a repository without commits as a repository Kyle Meyer
2019-03-14 15:02 ` [PATCH 1/4] submodule: refuse to add repository with no commits Kyle Meyer
2019-03-16 15:40 ` Kyle Meyer
2019-04-02 18:35 ` [PATCH v2 0/4] dir: Treat a repository without commits as a repository Kyle Meyer
2019-04-02 18:35 ` [PATCH v2 1/4] submodule: refuse to add repository with no commits Kyle Meyer
2019-04-04 7:24 ` Junio C Hamano
2019-04-02 18:35 ` [PATCH v2 2/4] t3000: move non-submodule repo test to separate file Kyle Meyer
2019-04-03 7:59 ` Junio C Hamano
2019-04-03 22:21 ` Kyle Meyer
2019-04-02 18:35 ` [PATCH v2 3/4] t3009: test that ls-files -o traverses bogus repo Kyle Meyer
2019-04-02 18:35 ` [PATCH v2 4/4] dir: do not traverse repositories with no commits Kyle Meyer
2019-04-03 8:05 ` Junio C Hamano
2019-04-03 22:25 ` Kyle Meyer
2019-03-14 15:02 ` Kyle Meyer [this message]
2019-03-14 15:02 ` [PATCH 3/4] t3009: test that ls-files -o traverses bogus repo Kyle Meyer
2019-03-14 15:02 ` [PATCH 4/4] dir: do not traverse repositories with no commits Kyle Meyer
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=20190314150219.2040-3-kyle@kyleam.com \
--to=kyle@kyleam.com \
--cc=debian@onerussian.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.