From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, Jens.Lehmann@web.de, jacob.keller@gmail.com
Subject: Re: [PATCH 2/7] submodule foreach: correct path computation in recursive submodules
Date: Mon, 28 Mar 2016 22:44:58 -0700 [thread overview]
Message-ID: <xmqq60w525yd.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1459207703-1635-3-git-send-email-sbeller@google.com> (Stefan Beller's message of "Mon, 28 Mar 2016 16:28:18 -0700")
Stefan Beller <sbeller@google.com> writes:
> The test which is fixed by this patch would report
> Entering 'nested1/nested2/../nested3'
> instead of the expected
> Entering '../nested1/nested2/nested3'
>
> because the prefix is put unconditionally in front and after that a
> computed display path with is affected by `wt_prefix`. This is wrong as
> any relative path computation would need to be at the front. By emptying
> the `wt_prefix` in recursive submodules and adding the information of any
> relative path into the `prefix` this is fixed.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
Nicely explained and executed.
FWIW, it is fine to have a fix and new tests to demonstrate the fix
to pre-existing breakages in a single step. It is easier to review
when we can see the body of the test (as opposed to just the change
s/expect_failure/expect_success/) in the same patch as the change to
the code for a focused and small fix like these patches 1 & 2; it is
easy to partially revert the patch for such a focused and small fix
when a reviewer wants to verify that the new tests fail without the
code change.
> git-submodule.sh | 3 ++-
> t/t7407-submodule-foreach.sh | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/git-submodule.sh b/git-submodule.sh
> index 43c68de..2838069 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -417,10 +417,11 @@ cmd_foreach()
> say "$(eval_gettext "Entering '\$prefix\$displaypath'")"
> name=$(git submodule--helper name "$sm_path")
> (
> - prefix="$prefix$sm_path/"
> + prefix="$(relative_path $prefix$sm_path)/"
Make sure that "$prefix$sm_path" is given as a single string to
relative_path. I'd probably write this like so:
- prefix="$prefix$sm_path/"
+ prefix=$(relative_path "$prefix$sm_path")/
Thanks.
next prev parent reply other threads:[~2016-03-29 5:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-28 23:28 [PATCH 0/7] Fix path bugs in submodule commands executed from sub dir [WAS: submodule--helper clone: lose the extra prefix option] Stefan Beller
2016-03-28 23:28 ` [PATCH 1/7] submodule foreach: test path handling in recursive submodules Stefan Beller
2016-03-28 23:28 ` [PATCH 2/7] submodule foreach: correct path computation " Stefan Beller
2016-03-29 5:44 ` Junio C Hamano [this message]
2016-03-29 19:00 ` Junio C Hamano
2016-03-29 19:21 ` Stefan Beller
2016-03-29 19:26 ` Stefan Beller
2016-03-28 23:28 ` [PATCH 3/7] submodule update --init: test path handling " Stefan Beller
2016-03-29 5:48 ` Junio C Hamano
2016-03-28 23:28 ` [PATCH 4/7] submodule update --init: correct " Stefan Beller
2016-03-29 5:50 ` Junio C Hamano
2016-03-29 19:46 ` Junio C Hamano
2016-03-29 19:49 ` Stefan Beller
2016-03-28 23:28 ` [PATCH 5/7] t7407: make expectation as clear as possible Stefan Beller
2016-03-29 19:30 ` Junio C Hamano
2016-03-28 23:28 ` [PATCH 6/7] submodule status: test path handling in recursive submodules Stefan Beller
2016-03-28 23:28 ` [PATCH 7/7] submodule status: fix " 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=xmqq60w525yd.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=sbeller@google.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).