diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-22 17:11:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-22 17:11:09 -0700 |
| commit | 6295f87b5f46fcb1037eb12e81afaf0490a00922 (patch) | |
| tree | b57cca00fffcb5ce6ff263685794cdbd0c54e819 /t/helper | |
| parent | The seventh batch (diff) | |
| parent | revision: remove "submodule" from opt struct (diff) | |
| download | tgif-6295f87b5f46fcb1037eb12e81afaf0490a00922.tar.xz | |
Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
* jt/add-submodule-odb-clean-up:
revision: remove "submodule" from opt struct
repository: support unabsorbed in repo_submodule_init
submodule: remove unnecessary unabsorbed fallback
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-submodule-nested-repo-config.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c index e3f11ff5a7..dc1c14bde3 100644 --- a/t/helper/test-submodule-nested-repo-config.c +++ b/t/helper/test-submodule-nested-repo-config.c @@ -11,15 +11,13 @@ static void die_usage(const char **argv, const char *msg) int cmd__submodule_nested_repo_config(int argc, const char **argv) { struct repository subrepo; - const struct submodule *sub; if (argc < 3) die_usage(argv, "Wrong number of arguments."); setup_git_directory(); - sub = submodule_from_path(the_repository, null_oid(), argv[1]); - if (repo_submodule_init(&subrepo, the_repository, sub)) { + if (repo_submodule_init(&subrepo, the_repository, argv[1], null_oid())) { die_usage(argv, "Submodule not found."); } |