From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Jens Lehmann <Jens.Lehmann@web.de>,
Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH 4/7] submodule update --init: correct path handling in recursive submodules
Date: Tue, 29 Mar 2016 12:49:50 -0700 [thread overview]
Message-ID: <CAGZ79kZZoxBsAfsTohrLqf2f01fmbjK2rrOG5vQ6ShT-zOjeJw@mail.gmail.com> (raw)
In-Reply-To: <xmqqbn5xxe25.fsf@gitster.mtv.corp.google.com>
On Tue, Mar 29, 2016 at 12:46 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>> This fixes the test introduced by the parent commit.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>
> The first hunk in this patch touches lines that goes away with
> d5bc3cd2 (submodule: port init from shell to C, 2016-03-14) on
> your sb/submodule-init topic and the whole block is replaced
> by a call to "submodule--helper init".
>
> I'll drop the first hunk when merging this series to 'pu' for now;
> hopefully you did not inherit the bug when rewriting the part into
> "submodule--helper init".
After examining this patch more closely for a better commit message, the second
hunk also goes away, i.e. only the test will remain.
Maybe I can roll this series on top of origin/sb/submodule-init, to
avoid confusion.
>
> Thanks.
>
>> 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)/"
>> clear_local_git_env
>> + wt_prefix=
>> cd "$sm_path" &&
>> eval cmd_update
>> )
>> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
>> index c1b9ffa..3bd1552 100755
>> --- a/t/t7406-submodule-update.sh
>> +++ b/t/t7406-submodule-update.sh
>> @@ -118,7 +118,7 @@ Submodule path '../super/rebasing': checked out '${rebasingsha1}'
>> Submodule path '../super/submodule': checked out '${submodulesha1}'
>> EOF
>>
>> -test_expect_failure 'submodule update --init --recursive from subdirectory' '
>> +test_expect_success 'submodule update --init --recursive from subdirectory' '
>> git -C recursivesuper/super reset --hard HEAD^ &&
>> (cd recursivesuper &&
>> mkdir tmp &&
next prev parent reply other threads:[~2016-03-29 19:49 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
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 [this message]
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=CAGZ79kZZoxBsAfsTohrLqf2f01fmbjK2rrOG5vQ6ShT-zOjeJw@mail.gmail.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@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).