undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper: don't overlay config in remote_submodule_branch

Browse Source 
Don't rely on overlaying the repository's config on top of the
submodule-config, instead query the repository's config directly for the
branch field.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-08-03 11:19:49 -07:00 committed by Junio C Hamano
parent 5556808690
commit 177257ccc7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/submodule--helper.c
View File

@ -1066,17 +1066,24 @@ static int resolve_relative_path(int argc, const char **argv, const char *prefix
static const char *remote_submodule_branch(const char *path) static const char *remote_submodule_branch(const char *path)
{ {
const struct submodule *sub; const struct submodule *sub;
const char *branch = NULL;
char *key;
gitmodules_config(); gitmodules_config();
git_config(submodule_config, NULL);
sub = submodule_from_path(&null_oid, path); sub = submodule_from_path(&null_oid, path);
if (!sub) if (!sub)
return NULL; return NULL;
if (!sub->branch) key = xstrfmt("submodule.%s.branch", sub->name);
if (repo_config_get_string_const(the_repository, key, &branch))
branch = sub->branch;
free(key);
if (!branch)
return "master"; return "master";
if (!strcmp(sub->branch, ".")) { if (!strcmp(branch, ".")) {
unsigned char sha1[20]; unsigned char sha1[20];
const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL); const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
@ -1094,7 +1101,7 @@ static const char *remote_submodule_branch(const char *path)
return refname; return refname;
} }
return sub->branch; return branch;
} }
static int resolve_remote_submodule_branch(int argc, const char **argv, static int resolve_remote_submodule_branch(int argc, const char **argv,