Re: [PATCH 4/7] submodule update --init: correct path handling in recursive submodules
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 29, 2016, 05:50 UTC
- Message-ID
- <xmqqwpolzvb6.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1459207703-1635-5-git-send-email-sbeller@google.com>
Stefan Beller <sbeller@google.com> writes:
> This fixes the test introduced by the parent commit. > > Signed-off-by: Stefan Beller <sbeller@google.com>
Unlike 2/7, this is kinda on the thin side in the explanation department, it looks.
Show 24 quoted lines
> --- > git-submodule.sh | 5 +++-- > t/t7406-submodule-update.sh | 2 +- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/git-submodule.sh b/git-submodule.sh > index 2838069..a7c8599 100755 > --- a/git-submodule.sh > +++ b/git-submodule.sh > @@ -474,7 +474,7 @@ cmd_init() > die_if_unmatched "$mode" > name=$(git submodule--helper name "$sm_path") || exit > > - displaypath=$(relative_path "$sm_path") > + displaypath=$(relative_path "$prefix$sm_path") > > # Copy url setting when it is not set yet > if test -z "$(git config "submodule.$name.url")" > @@ -826,8 +826,9 @@ Maybe you want to use 'update --init'?")" > if test -n "$recursive" > then > ( > - prefix="$prefix$sm_path/" > + prefix="$(relative_path $prefix$sm_path)/"
Same here as 2/7 (see the above hunk which does this correctly).
Show 5 quoted lines
> clear_local_git_env > + wt_prefix= > cd "$sm_path" && > eval cmd_update > )