From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, git@vger.kernel.org
Cc: norio.nomura@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCH 1/4] recursive submodules: test for relative paths
Date: Wed, 30 Mar 2016 17:17:34 -0700 [thread overview]
Message-ID: <1459383457-6848-2-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1459383457-6848-1-git-send-email-sbeller@google.com>
This was reported as a regression at $gmane/290280. The root cause for
that bug is in using recursive submodules as their relative path handling
seems to be broken in ee8838d (2015-09-08, submodule: rewrite
`module_clone` shell function in C).
Signed-off-by: Stefan Beller <sbeller@google.com>
---
t/t7400-submodule-basic.sh | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 540771c..fc11809 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -818,6 +818,47 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
)
'
+test_expect_failure 'recursive relative submodules stay relative' '
+ test_when_finished "rm -rf super clone2 subsub sub3" &&
+ mkdir subsub &&
+ (
+ cd subsub &&
+ git init &&
+ >t &&
+ git add t &&
+ git commit -m "initial commit"
+ ) &&
+ mkdir sub3 &&
+ (
+ cd sub3 &&
+ git init &&
+ >t &&
+ git add t &&
+ git commit -m "initial commit" &&
+ git submodule add ../subsub dirdir/subsub &&
+ git commit -m "add submodule subsub"
+ ) &&
+ mkdir super &&
+ (
+ cd super &&
+ git init &&
+ >t &&
+ git add t &&
+ git commit -m "initial commit" &&
+ git submodule add ../sub3 &&
+ git commit -m "add submodule sub"
+ ) &&
+ git clone super clone2 &&
+ (
+ cd clone2 &&
+ git submodule update --init --recursive &&
+ echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
+ echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
+ ) &&
+ test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
+ test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
+'
+
test_expect_success 'submodule add with an existing name fails unless forced' '
(
cd addtest2 &&
--
2.5.0.264.g4004fdc.dirty
next prev parent reply other threads:[~2016-03-31 0:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 0:17 [PATCH 0/4] Fix relative path issues in recursive submodules Stefan Beller
2016-03-31 0:17 ` Stefan Beller [this message]
2016-03-31 16:33 ` [PATCH 1/4] recursive submodules: test for relative paths Junio C Hamano
2016-03-31 16:47 ` Stefan Beller
2016-03-31 0:17 ` [PATCH 2/4] submodule--helper clone: simplify path check Stefan Beller
2016-03-31 0:32 ` Jacob Keller
2016-03-31 7:31 ` Eric Sunshine
2016-03-31 17:17 ` Stefan Beller
2016-03-31 16:36 ` Junio C Hamano
2016-03-31 17:04 ` Eric Sunshine
2016-03-31 0:17 ` [PATCH 3/4] submodule--helper clone: remove double path checking Stefan Beller
2016-03-31 16:44 ` Junio C Hamano
2016-03-31 0:17 ` [PATCH 4/4] submodule--helper: use relative path if possible Stefan Beller
2016-03-31 16:59 ` Junio C Hamano
2016-03-31 19:22 ` Stefan Beller
2016-03-31 17:04 ` [PATCH 0/4] Fix relative path issues in recursive submodules Junio C Hamano
2016-03-31 17:20 ` Stefan Beller
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=1459383457-6848-2-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=norio.nomura@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.
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).