diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-07-14 02:49:20 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-17 23:54:37 +0300 |
| commit | cd73de47148c16760a62fa3f75cafe015ca764b2 (patch) | |
| tree | 307e99cfba18e3b880af01bf9656a961298439fd /builtin/grep.c | |
| parent | d1a35e5c93eb57abd1133a8c55ba961cc55268a6 (diff) | |
submodule: convert submodule config lookup to use object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 0d6e669732..a0528321fe 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -653,7 +653,7 @@ static int grep_submodule(struct grep_opt *opt, const struct object_id *oid, */ if (oid) { const struct submodule *sub = - submodule_from_path(null_sha1, path); + submodule_from_path(&null_oid, path); if (sub) path = git_path("modules/%s", sub->name); @@ -862,7 +862,7 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, /* load the gitmodules file for this rev */ if (recurse_submodules) { submodule_free(); - gitmodules_config_sha1(real_obj->oid.hash); + gitmodules_config_oid(&real_obj->oid); } if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path)) { hit = 1; |