From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: sbeller@google.com, Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v2] add test to demonstrate that shallow recursive clones fail
Date: Thu, 12 Nov 2015 10:37:41 +0100 [thread overview]
Message-ID: <1447321061-74381-1-git-send-email-larsxschneider@gmail.com> (raw)
From: Lars Schneider <larsxschneider@gmail.com>
"git clone --recursive --depth 1 --single-branch <url>" clones the
submodules successfully. However, it does not obey "--depth 1" for
submodule cloning.
The following workaround does only work if the used submodule pointer
is on the default branch. Otherwise "git submodule update" fails with
"fatal: reference is not a tree:" and "Unable to checkout".
git clone --depth 1 --single-branch <url>
cd <repo-name>
git submodule update --init --recursive --depth 1
The workaround does not fail using the "--remote" flag. However, in that
case the wrong commit is checked out.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
t/t7412-submodule-recursive.sh | 78 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
create mode 100755 t/t7412-submodule-recursive.sh
diff --git a/t/t7412-submodule-recursive.sh b/t/t7412-submodule-recursive.sh
new file mode 100755
index 0000000..aaf252b
--- /dev/null
+++ b/t/t7412-submodule-recursive.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+test_description='Test shallow cloning of repos with submodules'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ git checkout -b master &&
+ echo file >file &&
+ git add file &&
+ test_tick &&
+ git commit -m "master commit 1" &&
+
+ git checkout -b branch &&
+ echo file >branch-file &&
+ git add branch-file &&
+ test_tick &&
+ git commit -m "branch commit 1" &&
+
+ git checkout master &&
+ git clone . repo &&
+ (
+ cd repo &&
+ git checkout master &&
+ git submodule add ../. submodule &&
+ (
+ cd submodule &&
+ git checkout branch
+ ) &&
+ git add submodule &&
+ test_tick &&
+ git commit -m "master commit 2"
+ )
+'
+
+test_expect_failure shallow-clone-recursive '
+ URL="file://$(pwd | sed "s/[[:space:]]/%20/g")/repo" &&
+ echo $URL &&
+ git clone --recursive --depth 1 --single-branch $URL clone-recursive &&
+ (
+ cd "clone-recursive" &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines
+ ) &&
+ (
+ cd "clone-recursive/submodule" &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines
+ )
+'
+
+test_expect_failure shallow-clone-recursive-workaround '
+ URL="file://$(pwd | sed "s/[[:space:]]/%20/g")/repo" &&
+ echo $URL &&
+ git clone --depth 1 --single-branch $URL clone-recursive-workaround &&
+ (
+ cd "clone-recursive-workaround" &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines &&
+ git submodule update --init --recursive --depth 1
+ )
+'
+
+test_expect_failure shallow-clone-recursive-with-remote-workaround '
+ URL="file://$(pwd | sed "s/[[:space:]]/%20/g")/repo" &&
+ echo $URL &&
+ git clone --depth 1 --single-branch $URL clone-recursive-remote-workaround &&
+ (
+ cd "clone-recursive-remote-workaround" &&
+ git log --oneline >lines &&
+ test_line_count = 1 lines &&
+ git submodule update --init --remote --recursive --depth 1 &&
+ git status submodule >status &&
+ test_must_fail grep "modified:" status
+ )
+'
+
+test_done
--
2.5.1
next reply other threads:[~2015-11-12 9:37 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-12 9:37 larsxschneider [this message]
2015-11-12 23:34 ` [PATCH v2] add test to demonstrate that shallow recursive clones fail Stefan Beller
2015-11-15 12:43 ` Lars Schneider
2015-11-13 5:35 ` Jeff King
2015-11-13 18:41 ` Stefan Beller
2015-11-13 23:16 ` Stefan Beller
2015-11-13 23:38 ` Jeff King
2015-11-13 23:41 ` Jeff King
2015-11-14 0:10 ` Stefan Beller
2015-11-16 18:59 ` Jens Lehmann
2015-11-16 19:25 ` Stefan Beller
2015-11-16 21:42 ` Jens Lehmann
2015-11-16 22:56 ` Stefan Beller
2015-11-17 19:46 ` Jens Lehmann
2015-11-17 20:04 ` Stefan Beller
2015-11-17 20:39 ` Jens Lehmann
2015-11-17 20:49 ` Stefan Beller
2015-11-17 21:00 ` Jens Lehmann
2015-11-17 20:17 ` Duy Nguyen
2015-11-17 21:43 ` Jeff King
2015-11-18 12:32 ` Duy Nguyen
2015-11-18 21:11 ` Jeff King
2015-11-18 21:36 ` Stefan Beller
[not found] ` <CAOE36qj2m4e3hw73-QoLbbpGv4RiyhBt_ou7eN4i4q8pF15rdA@mail.gmail.com>
2015-11-19 13:58 ` Jeff King
2015-11-30 18:11 ` Junio C Hamano
2015-12-01 0:47 ` Stefan Beller
2015-12-01 12:15 ` Duy Nguyen
2015-12-01 21:47 ` Junio C Hamano
2015-12-01 22:22 ` Junio C Hamano
2015-12-03 20:03 ` Stefan Beller
2015-12-04 15:32 ` Junio C Hamano
2015-12-04 16:15 ` Junio C Hamano
2015-12-04 7:52 ` Duy Nguyen
2015-11-15 12:53 ` Lars Schneider
2015-11-17 21:34 ` 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=1447321061-74381-1-git-send-email-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--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).