submodule-config.c: use repo_get_oid for reading .gitmodules
Since 76e9bdc437 (submodule: support reading .gitmodules when it's not in the working tree - 2018-10-25), every time you do git grep --recurse-submodules you are likely to see one warning line per submodule (unless all those submodules also have submodules). On a superproject with plenty of submodules (I've seen one with 67) this is really annoying. The warning was there because we could not resolve extended SHA-1 syntax on a submodule. We can now. Make use of the new API and get rid of the warning. It would be even better if config_with_options() supports multiple repositories too. But one step at a time. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Apr 16, 2019 at 16:33 UTC
d9b8b8f896f92639f06708dcd641c0706fcfd6a4
2 files changed
+8
-18
submodule-config.c
+7
-13
@@ -625,23 +625,16 @@ static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void
625
const struct config_options opts = { 0 };
626
struct object_id oid;
627
char *file;
628
+ char *oidstr = NULL;
629
630
file = repo_worktree_path(repo, GITMODULES_FILE);
631
if (file_exists(file)) {
632
config_source.file = file;
632
- } else if (repo->submodule_prefix) {
633
- /*
634
- * When get_oid and config_with_options, used below,
635
- * become able to work on a specific repository, this
636
- * warning branch can be removed.
637
- */
638
- warning("nested submodules without %s in the working tree are not supported yet",
639
- GITMODULES_FILE);
640
- goto out;
641
- } else if (get_oid(GITMODULES_INDEX, &oid) >= 0) {
642
- config_source.blob = GITMODULES_INDEX;
643
- } else if (get_oid(GITMODULES_HEAD, &oid) >= 0) {
644
- config_source.blob = GITMODULES_HEAD;
633
+ } else if (repo_get_oid(repo, GITMODULES_INDEX, &oid) >= 0 ||
634
+ repo_get_oid(repo, GITMODULES_HEAD, &oid) >= 0) {
635
+ config_source.blob = oidstr = xstrdup(oid_to_hex(&oid));
636
+ if (repo != the_repository)
637
+ add_to_alternates_memory(repo->objects->odb->path);
638
} else {
639
goto out;
640
}
@@ -649,6 +642,7 @@ static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void
642
config_with_options(fn, data, &config_source, &opts);
643
644
out:
645
+ free(oidstr);
646
free(file);
647
}
648
}
t/t7814-grep-recurse-submodules.sh
+1
-5
@@ -380,11 +380,7 @@ test_expect_success 'grep --recurse-submodules should pass the pattern type alon
380
fi
381
'
382
383
-# Recursing down into nested submodules which do not have .gitmodules in their
384
-# working tree does not work yet. This is because config_from_gitmodules()
385
-# uses get_oid() and the latter is still not able to get objects from an
386
-# arbitrary repository (the nested submodule, in this case).
387
-test_expect_failure 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
383
+test_expect_success 'grep --recurse-submodules with submodules without .gitmodules in the working tree' '
384
test_when_finished "git -C submodule checkout .gitmodules" &&
385
rm submodule/.gitmodules &&
386
git grep --recurse-submodules -e "(.|.)[\d]" >actual &&