On Fri, Apr 29, 2016 at 11:27 AM, Junio C Hamano <[email protected]> wrote:
> Stefan Beller <[email protected]> writes:
>
>> Reroute the output of stdout to stderr as it is just informative
>> messages, not to be consumed by machines.
>>
>> We want to init submodules from the helper for `submodule update`
>> in a later patch and the stdout output of said helper is consumed
>> by the parts of `submodule update` which are still written in shell.
>> So we have to be careful which messages are on stdout.
>>
>> Signed-off-by: Stefan Beller <[email protected]>
>> ---
>
> I do not mind if this step is split out and queued as a separate
> follow-up to sb/submodule-init. The grouping and labelling is a
> bigger and more important change that deserves attention without
> distraction than this single step, and making as many such things
> graduate and allowing us to forget about them is better ;-)
Care to apply this onto the sb/submodule-init then?
(It applies cleanly for me on top of "submodule--helper update-clone:
abort gracefully on missing .gitmodules")
I'll drop this patch in the groups series.
Thanks,
Stefan
>
>> builtin/submodule--helper.c | 3 ++-
>> t/t7406-submodule-update.sh | 24 ++++++++++++++++++------
>> 2 files changed, 20 insertions(+), 7 deletions(-)
>>
>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
>> index 23d7224..7b9a4d7 100644
>> --- a/builtin/submodule--helper.c
>> +++ b/builtin/submodule--helper.c
>> @@ -362,7 +362,8 @@ static void init_submodule(const char *path, const char
>> *prefix, int quiet)
>> die(_("Failed to register url for submodule path
>> '%s'"),
>> displaypath);
>> if (!quiet)
>> - printf(_("Submodule '%s' (%s) registered for path
>> '%s'\n"),
>> + fprintf(stderr,
>> + _("Submodule '%s' (%s) registered for path
>> '%s'\n"),
>> sub->name, url, displaypath);
>> }
>>
>> diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
>> index fd741f5..5f27879 100755
>> --- a/t/t7406-submodule-update.sh
>> +++ b/t/t7406-submodule-update.sh
>> @@ -108,24 +108,36 @@ pwd=$(pwd)
>>
>> cat <<EOF >expect
>> Submodule path '../super': checked out '$supersha1'
>> -Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
>> -Submodule 'none' ($pwd/none) registered for path '../super/none'
>> -Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
>> -Submodule 'submodule' ($pwd/submodule) registered for path
>> '../super/submodule'
>> Submodule path '../super/merging': checked out '$mergingsha1'
>> Submodule path '../super/none': checked out '$nonesha1'
>> Submodule path '../super/rebasing': checked out '$rebasingsha1'
>> Submodule path '../super/submodule': checked out '$submodulesha1'
>> EOF
>>
>> +cat <<EOF >expect2
>> +Submodule 'merging' ($pwd/merging) registered for path '../super/merging'
>> +Submodule 'none' ($pwd/none) registered for path '../super/none'
>> +Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing'
>> +Submodule 'submodule' ($pwd/submodule) registered for path
>> '../super/submodule'
>> +Cloning into '$pwd/recursivesuper/super/merging'...
>> +done.
>> +Cloning into '$pwd/recursivesuper/super/none'...
>> +done.
>> +Cloning into '$pwd/recursivesuper/super/rebasing'...
>> +done.
>> +Cloning into '$pwd/recursivesuper/super/submodule'...
>> +done.
>> +EOF
>> +
>> test_expect_success 'submodule update --init --recursive from subdirectory'
>> '
>> git -C recursivesuper/super reset --hard HEAD^ &&
>> (cd recursivesuper &&
>> mkdir tmp &&
>> cd tmp &&
>> - git submodule update --init --recursive ../super >../../actual
>> + git submodule update --init --recursive ../super >../../actual
>> 2>../../actual2
>> ) &&
>> - test_cmp expect actual
>> + test_cmp expect actual &&
>> + test_cmp expect2 actual2
>> '
>>
>> apos="'";
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
