On Tue, Mar 29, 2016 at 12:46 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Stefan Beller <sbel...@google.com> writes:
>
>> This fixes the test introduced by the parent commit.
>>
>> Signed-off-by: Stefan Beller <sbel...@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 &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
