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>
This commit is contained in:

committed by
Junio C Hamano

parent
d1a35e5c93
commit
cd73de4714
@ -350,7 +350,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
|
||||
} else
|
||||
displaypath = xstrdup(path);
|
||||
|
||||
sub = submodule_from_path(null_sha1, path);
|
||||
sub = submodule_from_path(&null_oid, path);
|
||||
|
||||
if (!sub)
|
||||
die(_("No url found for submodule path '%s' in .gitmodules"),
|
||||
@ -476,7 +476,7 @@ static int module_name(int argc, const char **argv, const char *prefix)
|
||||
usage(_("git submodule--helper name <path>"));
|
||||
|
||||
gitmodules_config();
|
||||
sub = submodule_from_path(null_sha1, argv[1]);
|
||||
sub = submodule_from_path(&null_oid, argv[1]);
|
||||
|
||||
if (!sub)
|
||||
die(_("no submodule mapping found in .gitmodules for path '%s'"),
|
||||
@ -795,7 +795,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
sub = submodule_from_path(null_sha1, ce->name);
|
||||
sub = submodule_from_path(&null_oid, ce->name);
|
||||
|
||||
if (suc->recursive_prefix)
|
||||
displaypath = relative_path(suc->recursive_prefix,
|
||||
@ -1060,7 +1060,7 @@ static const char *remote_submodule_branch(const char *path)
|
||||
gitmodules_config();
|
||||
git_config(submodule_config, NULL);
|
||||
|
||||
sub = submodule_from_path(null_sha1, path);
|
||||
sub = submodule_from_path(&null_oid, path);
|
||||
if (!sub)
|
||||
return NULL;
|
||||
|
||||
|
Reference in New Issue
Block a user