From: "Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
Stefan Beller <stefanbeller@gmail.com>,
Damien Robert <damien.olivier.robert@gmail.com>,
Philippe Blain <levraiphilippeblain@gmail.com>
Subject: [PATCH 0/6] unpack-trees: fix '--recurse-submodules' when switching from no submodules to nested submodules
Date: Mon, 17 Feb 2020 04:53:00 +0000 [thread overview]
Message-ID: <pull.555.git.1581915186.gitgitgadget@gmail.com> (raw)
Currently, using git checkout --recurse-submodules (or the submodule.recurse
config) to switch from a commit with no submodules to a commit with
initialized nested submodules fails because a child git process tries to cd
to a yet non-existing nested submodule directory. reset and read-tree are
also affected in the same way since they also use the unpack-trees
machinery.
The 5th commit in this series fixes this bug. The first four are clean-up
patches in tests and in unpack-trees that mostly remove outdated
comments/dead code. The 6th commit adds a test for the reverse transition
(nested submodules -> no submodules) as it was not being tested.
The commit message of the 5th commit is quite long, as I tried to describe
clearly what is the cause of the bug.
Philippe Blain (6):
t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED
t/lib-submodule-update: remove outdated test description
t/lib-submodule-update: move a test to the right section
unpack-trees: remove outdated description for verify_clean_submodule
unpack-trees: check for missing submodule directory in merged_entry
t/lib-submodule-update: add test removing nested submodules
t/lib-submodule-update.sh | 68 +++++++++++++++++++++++++++-----------
t/t7112-reset-submodule.sh | 1 -
unpack-trees.c | 7 ++--
3 files changed, 51 insertions(+), 25 deletions(-)
base-commit: d8437c57fa0752716dde2d3747e7c22bf7ce2e41
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-555%2Fphil-blain%2Fcheckout-recurse-nested-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-555/phil-blain/checkout-recurse-nested-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/555
--
gitgitgadget
next reply other threads:[~2020-02-17 4:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 4:53 Philippe Blain via GitGitGadget [this message]
2020-02-17 4:53 ` [PATCH 1/6] t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED Philippe Blain via GitGitGadget
2020-02-19 23:26 ` Junio C Hamano
2020-02-17 4:53 ` [PATCH 2/6] t/lib-submodule-update: remove outdated test description Philippe Blain via GitGitGadget
2020-02-17 4:53 ` [PATCH 3/6] t/lib-submodule-update: move a test to the right section Philippe Blain via GitGitGadget
2020-02-17 4:53 ` [PATCH 4/6] unpack-trees: remove outdated description for verify_clean_submodule Philippe Blain via GitGitGadget
2020-02-17 4:53 ` [PATCH 5/6] unpack-trees: check for missing submodule directory in merged_entry Philippe Blain via GitGitGadget
2020-02-19 23:32 ` Junio C Hamano
2020-02-17 4:53 ` [PATCH 6/6] t/lib-submodule-update: add test removing nested submodules Philippe Blain via GitGitGadget
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=pull.555.git.1581915186.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=damien.olivier.robert@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=levraiphilippeblain@gmail.com \
--cc=stefanbeller@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).