From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Subject: Re: [PATCH] submodule.c: report the submodule that an error occurs in
Date: Mon, 25 Jun 2018 08:58:20 -0700 [thread overview]
Message-ID: <xmqqmuviq2n7.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180622081713.5360-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Fri, 22 Jun 2018 10:17:13 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
>> When an error occurs in updating the working tree of a submodule in
>> submodule_move_head, tell the user which submodule the error occurred in.
>>
>> The call to read-tree contains a super-prefix, such that the read-tree
>> will correctly report any path related issues, but some error messages
>> do not contain a path, for example:
>>
>> ~/gerrit$ git checkout --recurse-submodules origin/master
>> ~/gerrit$ fatal: failed to unpack tree object 07672f31880ba80300b38492df9d0acfcd6ee00a
>>
>> Give the hint which submodule has a problem.
>>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>> submodule.c | 2 +-
>> t/lib-submodule-update.sh | 3 ++-
>> 2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/submodule.c b/submodule.c
>> index 939d6870ecd..ebd092a14fd 100644
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -1668,7 +1668,7 @@ int submodule_move_head(const char *path,
>> argv_array_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
>>
>> if (run_command(&cp)) {
>> - ret = -1;
>> + ret = error(_("Submodule '%s' could not be updated."), path);
>
> This is a translated error message ...
>
>> goto out;
>> }
>>
>> diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
>> index 1f38a85371a..e27f5d8541d 100755
>> --- a/t/lib-submodule-update.sh
>> +++ b/t/lib-submodule-update.sh
>> @@ -781,7 +781,8 @@ test_submodule_recursing_with_args_common() {
>> (
>> cd submodule_update &&
>> git branch -t invalid_sub1 origin/invalid_sub1 &&
>> - test_must_fail $command invalid_sub1 &&
>> + test_must_fail $command invalid_sub1 2>err &&
>> + grep sub1 err &&
>
> ... so the test should use 'test_i18ngrep' to check it.
Thanks for being a careful reviewer, as always.
Will tweak locally to skip one round-trip.
next prev parent reply other threads:[~2018-06-25 15:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-20 22:32 [PATCH] submodule.c: report the submodule that an error occurs in Stefan Beller
2018-06-21 21:00 ` Junio C Hamano
2018-06-22 8:17 ` SZEDER Gábor
2018-06-25 15:58 ` Junio C Hamano [this message]
2018-06-27 17:02 ` 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=xmqqmuviq2n7.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
--cc=szeder.dev@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).