From: Max Kirillov <max@max630.net>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Heiko Voigt" <hvoigt@hvoigt.net>,
"Jens Lehmann" <Jens.Lehmann@web.de>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Max Kirillov <max@max630.net>
Subject: [PATCH 0/4] Multiple worktrees vs. submodules fixes
Date: Sun, 12 Oct 2014 08:13:07 +0300 [thread overview]
Message-ID: <1413090791-14428-1-git-send-email-max@max630.net> (raw)
Hi.
These are fixes of issues with submodules with use of multiple working
trees.
To be applied on top of the $gmane/257559, (6b4ce012cb in current pu).
Max Kirillov (4):
checkout: do not fail if target is an empty directory
submodule refactor: use git_path_submodule() in add_submodule_odb()
git-common-dir: make "modules/" per-working-directory directory
path: implement common_dir handling in git_path_submodule()
Documentation/gitrepository-layout.txt | 4 +--
builtin/checkout.c | 2 +-
cache.h | 1 +
path.c | 26 +++++++++++---
setup.c | 17 +++++++---
submodule.c | 28 ++++++---------
t/t2025-checkout-to.sh | 7 +++-
t/t7410-submodule-checkout-to.sh | 62 ++++++++++++++++++++++++++++++++++
8 files changed, 114 insertions(+), 33 deletions(-)
create mode 100755 t/t7410-submodule-checkout-to.sh
--
2.0.1.1697.g73c6810
next reply other threads:[~2014-10-12 5:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-12 5:13 Max Kirillov [this message]
2014-10-12 5:13 ` [PATCH 1/4] checkout: do not fail if target is an empty directory Max Kirillov
2014-10-12 5:13 ` [PATCH 2/4] submodule refactor: use git_path_submodule() in add_submodule_odb() Max Kirillov
2014-10-12 5:13 ` [PATCH 3/4] git-common-dir: make "modules/" per-working-directory directory Max Kirillov
2014-10-12 5:13 ` [PATCH 4/4] path: implement common_dir handling in git_path_submodule() Max Kirillov
2014-10-14 12:17 ` [PATCH 0/4] Multiple worktrees vs. submodules fixes Duy Nguyen
2014-10-14 17:09 ` Jens Lehmann
2014-10-14 17:26 ` Junio C Hamano
2014-10-14 18:34 ` Max Kirillov
2014-10-14 19:51 ` Jens Lehmann
2014-10-14 22:15 ` Max Kirillov
2014-10-15 14:14 ` Duy Nguyen
2014-10-15 18:57 ` Jens Lehmann
2014-10-16 20:54 ` Max Kirillov
2014-10-19 19:30 ` Jens Lehmann
2014-10-20 4:11 ` Max Kirillov
2014-11-03 12:54 ` Duy Nguyen
2014-11-03 20:57 ` Jens Lehmann
2014-11-03 22:07 ` Max Kirillov
2014-10-14 20:31 ` Max Kirillov
2014-10-15 13:08 ` Duy Nguyen
2014-10-15 17:09 ` Junio C Hamano
2014-10-17 9:14 ` Duy Nguyen
2014-10-19 19:34 ` Jens Lehmann
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=1413090791-14428-1-git-send-email-max@max630.net \
--to=max@max630.net \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@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.
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).