diff mbox series

[v3,7/7] submodule: trace adding submodule ODB as alternate

Message ID e4b6ee218656bb7c296475ae70562472ddd45682.1632956589.git.jonathantanmy@google.com (mailing list archive)
State Superseded
Headers show
Series No more adding submodule ODB as alternate | expand

Commit Message

Jonathan Tan Sept. 29, 2021, 11:06 p.m. UTC
Submodule ODBs are never added as alternates during the execution of the
test suite, but there may be a rare interaction that the test suite does
not have coverage of. Add a trace message when this happens, so that
users who trace their commands can notice such occurrences.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
 submodule.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Josh Steadmon Oct. 7, 2021, 6:34 p.m. UTC | #1
On 2021.09.29 16:06, Jonathan Tan wrote:
> Submodule ODBs are never added as alternates during the execution of the
> test suite, but there may be a rare interaction that the test suite does
> not have coverage of. Add a trace message when this happens, so that
> users who trace their commands can notice such occurrences.
> 
> Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> ---
>  submodule.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/submodule.c b/submodule.c
> index 4bf552b0e5..61575e5a56 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -201,6 +201,8 @@ int register_all_submodule_odb_as_alternates(void)
>  		add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
>  	if (ret) {
>  		string_list_clear(&added_submodule_odb_paths, 0);
> +		trace2_data_intmax("submodule", the_repository,
> +				   "register_all_submodule_odb_as_alternates/registered", ret);
>  		if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
>  			BUG("register_all_submodule_odb_as_alternates() called");
>  	}
> -- 
> 2.33.0.685.g46640cef36-goog
> 

Can you also update the GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB note in
t/README about tracing in this case?
Jonathan Tan Oct. 8, 2021, 8:23 p.m. UTC | #2
> On 2021.09.29 16:06, Jonathan Tan wrote:
> > Submodule ODBs are never added as alternates during the execution of the
> > test suite, but there may be a rare interaction that the test suite does
> > not have coverage of. Add a trace message when this happens, so that
> > users who trace their commands can notice such occurrences.
> > 
> > Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
> > ---
> >  submodule.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/submodule.c b/submodule.c
> > index 4bf552b0e5..61575e5a56 100644
> > --- a/submodule.c
> > +++ b/submodule.c
> > @@ -201,6 +201,8 @@ int register_all_submodule_odb_as_alternates(void)
> >  		add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
> >  	if (ret) {
> >  		string_list_clear(&added_submodule_odb_paths, 0);
> > +		trace2_data_intmax("submodule", the_repository,
> > +				   "register_all_submodule_odb_as_alternates/registered", ret);
> >  		if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
> >  			BUG("register_all_submodule_odb_as_alternates() called");
> >  	}
> > -- 
> > 2.33.0.685.g46640cef36-goog
> > 
> 
> Can you also update the GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB note in
> t/README about tracing in this case?

Good catch - I'll do that.
diff mbox series

Patch

diff --git a/submodule.c b/submodule.c
index 4bf552b0e5..61575e5a56 100644
--- a/submodule.c
+++ b/submodule.c
@@ -201,6 +201,8 @@  int register_all_submodule_odb_as_alternates(void)
 		add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
 	if (ret) {
 		string_list_clear(&added_submodule_odb_paths, 0);
+		trace2_data_intmax("submodule", the_repository,
+				   "register_all_submodule_odb_as_alternates/registered", ret);
 		if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
 			BUG("register_all_submodule_odb_as_alternates() called");
 	}