* [PATCH] submodule.c: report the submodule that an error occurs in
@ 2018-06-20 22:32 Stefan Beller
2018-06-21 21:00 ` Junio C Hamano
2018-06-22 8:17 ` SZEDER Gábor
0 siblings, 2 replies; 5+ messages in thread
From: Stefan Beller @ 2018-06-20 22:32 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
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);
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 &&
test_superproject_content origin/add_sub1 &&
test_submodule_content sub1 origin/add_sub1
)
--
2.18.0.rc2.346.g013aa6912e-goog
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] submodule.c: report the submodule that an error occurs in
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
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2018-06-21 21:00 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Stefan Beller <sbeller@google.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);
> goto out;
> }
OK. The function uses path in messages elsewhere so we know path
must not be empty and have a reasonable string content at this
point, which makes this a reasonably safe patch to apply ;-)
Thanks.
> 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 &&
> test_superproject_content origin/add_sub1 &&
> test_submodule_content sub1 origin/add_sub1
> )
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] submodule.c: report the submodule that an error occurs in
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
1 sibling, 1 reply; 5+ messages in thread
From: SZEDER Gábor @ 2018-06-22 8:17 UTC (permalink / raw)
To: Stefan Beller; +Cc: SZEDER Gábor, git
> 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.
> test_superproject_content origin/add_sub1 &&
> test_submodule_content sub1 origin/add_sub1
> )
> --
> 2.18.0.rc2.346.g013aa6912e-goog
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] submodule.c: report the submodule that an error occurs in
2018-06-22 8:17 ` SZEDER Gábor
@ 2018-06-25 15:58 ` Junio C Hamano
2018-06-27 17:02 ` Stefan Beller
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2018-06-25 15:58 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Stefan Beller, git
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] submodule.c: report the submodule that an error occurs in
2018-06-25 15:58 ` Junio C Hamano
@ 2018-06-27 17:02 ` Stefan Beller
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Beller @ 2018-06-27 17:02 UTC (permalink / raw)
To: Junio C Hamano; +Cc: SZEDER Gábor, git
On Mon, Jun 25, 2018 at 8:58 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> 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.
Thanks for tweaking locally. I reviewed your queued patch and
it looks good to me. Thanks!
I remember deliberately not using the i18n grep as we grep for
a part that should stay the same in all languages. However I
forgot that details of the test suite implementation (it doesn't
have a real translation, so it doesn't matter that this particular
piece of the message will show up in all translations)
Sorry for my mishap in thinking there.
Thanks,
Stefan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-27 17:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2018-06-27 17:02 ` Stefan Beller
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).