Skip to content

Commit 71ef66d

Browse files
jonathantanmygitster
authored andcommitted
submodule: trace adding submodule ODB as alternate
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 13a2f62 commit 71ef66d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

submodule.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ int register_all_submodule_odb_as_alternates(void)
201201
add_to_alternates_memory(added_submodule_odb_paths.items[i].string);
202202
if (ret) {
203203
string_list_clear(&added_submodule_odb_paths, 0);
204+
trace2_data_intmax("submodule", the_repository,
205+
"register_all_submodule_odb_as_alternates/registered", ret);
204206
if (git_env_bool("GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB", 0))
205207
BUG("register_all_submodule_odb_as_alternates() called");
206208
}

t/README

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,8 @@ GIT_TEST_FATAL_REGISTER_SUBMODULE_ODB=<boolean>, when true, makes
456456
registering submodule ODBs as alternates a fatal action. Support for
457457
this environment variable can be removed once the migration to
458458
explicitly providing repositories when accessing submodule objects is
459-
complete (in which case we might want to replace this with a trace2
460-
call so that users can make it visible if accessing submodule objects
461-
without an explicit repository still happens) or needs to be abandoned
462-
for whatever reason (in which case the migrated codepaths still retain
463-
their performance benefits).
459+
complete or needs to be abandoned for whatever reason (in which case the
460+
migrated codepaths still retain their performance benefits).
464461

465462
Naming Tests
466463
------------

0 commit comments

Comments
 (0)