From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: pclouds@gmail.com, Jens.Lehmann@web.de, jacob.keller@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/4] submodule: fix recursive execution from non root directory
Date: Thu, 24 Mar 2016 16:34:26 -0700 [thread overview]
Message-ID: <1458862468-12460-3-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1458862468-12460-1-git-send-email-sbeller@google.com>
One of the first things that happens in most submodule sub commands is
git submodule--helper list --prefix "$wt_prefix"
Currently the passed --prefix is used for doing path calculation
as if we were in that path relative to the repository root, which is
why we need to pass "$wt_prefix". The more common way in Git however
would be to use
git -C "$wt_prefix" submodule--helper list
which I want to change later. That way however does not just
pass the prefix into the submodule command, but also changes
into that directory.
Say you have the following setup
repo/ # a superproject repository
repo/untracked/ # an untracked dir in repo/
repo/sub/ # a submodule
repo/sub/subsub # a submodule of a submodule
When in repo/untracked/ and invoking "git submodule status --recursive",
the recursed instance of the latter version for listing submodules would
try to change into the directory repo/sub/untracked, which is a bug.
This happens as we cd into the submodule in git-submodule.sh without
clearing wt_prefix, which is the assumed relative path inside the working
directory.
Most times that directory doesn't exist and we error out. Fix this bug
by clearing wt_prefix, such that any recursive instances of will assume
to operate from the respective root of the respective submodule.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
git-submodule.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-submodule.sh b/git-submodule.sh
index 536ba68..6b18a03 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -827,6 +827,7 @@ Maybe you want to use 'update --init'?")"
(
prefix="$(relative_path $prefix$sm_path)/"
clear_local_git_env
+ wt_prefix=
cd "$sm_path" &&
eval cmd_update
)
@@ -1159,6 +1160,7 @@ cmd_status()
(
prefix="$displaypath/"
clear_local_git_env
+ wt_prefix=
cd "$sm_path" &&
eval cmd_status
) ||
@@ -1240,6 +1242,7 @@ cmd_sync()
if test -n "$recursive"
then
+ wt_prefix=
eval cmd_sync
fi
)
--
2.8.0.rc4.10.g52f3f33
next prev parent reply other threads:[~2016-03-24 23:34 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-24 23:34 [PATCHv2 0/4] submodule helper: cleanup prefix passing Stefan Beller
2016-03-24 23:34 ` [PATCH 1/4] submodule: fix recursive path printing from non root directory Stefan Beller
2016-03-24 23:38 ` Jacob Keller
2016-03-24 23:44 ` Stefan Beller
2016-03-25 16:43 ` Junio C Hamano
2016-03-25 16:54 ` Stefan Beller
2016-03-24 23:34 ` Stefan Beller [this message]
2016-03-24 23:41 ` [PATCH 2/4] submodule: fix recursive execution " Jacob Keller
2016-03-25 16:46 ` Junio C Hamano
2016-03-25 17:27 ` Stefan Beller
2016-03-24 23:34 ` [PATCH 3/4] submodule--helper list: lose the extra prefix option Stefan Beller
2016-03-24 23:44 ` Jacob Keller
2016-03-25 6:28 ` Junio C Hamano
2016-03-25 16:02 ` Junio C Hamano
2016-03-25 17:25 ` Junio C Hamano
2016-03-25 17:31 ` Stefan Beller
2016-03-25 16:49 ` Stefan Beller
2016-03-25 17:01 ` Junio C Hamano
2016-03-25 17:05 ` Stefan Beller
2016-03-25 18:32 ` Junio C Hamano
2016-03-24 23:34 ` [PATCH 4/4] submodule: add more tests for recursive submodule behavior Stefan Beller
2016-03-25 0:25 ` Eric Sunshine
2016-03-25 0:33 ` 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=1458862468-12460-3-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--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.
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).