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 0/4] Fix relative path issues in recursive submodules.
Date: Wed, 30 Mar 2016 17:17:33 -0700 [thread overview]
Message-ID: <1459383457-6848-1-git-send-email-sbeller@google.com> (raw)
It took me longer than expected to fix this bug.
It comes with a test and minor refactoring and applies on top of
origin/sb/submodule-helper, such that it can be merged into 2.7, 2.8 as well
as master.
Patch 1 is a test which fails; it has a similar layout as the
real failing repository Norio Nomura pointed out, but simplified to the
bare essentials for reproduction of the bug.
Patch 2&3 are not strictly necessary for fixing the isseu, but it removes
stupid code I wrote, so the resulting code looks a little better.
Patch 4 fixes the issue by giving more information to relative_path,
such that a relative path can be found in all cases.
Thanks,
Stefan
Stefan Beller (4):
recursive submodules: test for relative paths
submodule--helper clone: simplify path check
submodule--helper clone: remove double path checking
submodule--helper: use relative path if possible
builtin/submodule--helper.c | 16 ++++++++--------
t/t7400-submodule-basic.sh | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 8 deletions(-)
--
2.5.0.264.g4004fdc.dirty
next 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 Stefan Beller [this message]
2016-03-31 0:17 ` [PATCH 1/4] recursive submodules: test for relative paths Stefan Beller
2016-03-31 16:33 ` 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-1-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).