proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-04 03:14:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

submodule: reload HEAD/index after reading config

Browse Source 
Reload the HEAD and index data for a submodule after reading the
configuration.  The configuration may specify a `path`, so we must
update HEAD and index data with that path in mind.
This commit is contained in:
Edward Thomson 2015-11-04 16:17:51 -05:00 committed by Edward Thomson
parent 790012ce78
commit f4b0267122
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/submodule.c
View File

@ -1423,7 +1423,6 @@ static int submodule_update_head(git_submodule *submodule)
return 0;
}
int git_submodule_reload(git_submodule *sm, int force)
{
int error = 0;
@ -1433,35 +1432,30 @@ int git_submodule_reload(git_submodule *sm, int force)
assert(sm);
/* refresh index data */
if ((error = submodule_update_index(sm)) < 0)
return error;
if (!git_repository_is_bare(sm->repo)) {
/* refresh config data */
mods = gitmodules_snapshot(sm->repo);
if (mods != NULL) {
error = submodule_read_config(sm, mods);
git_config_free(mods);
/* refresh HEAD tree data */
if ((error = submodule_update_head(sm)) < 0)
return error;
/* done if bare */
if (git_repository_is_bare(sm->repo))
return error;
/* refresh config data */
mods = gitmodules_snapshot(sm->repo);
if (mods != NULL) {
error = submodule_read_config(sm, mods);
git_config_free(mods);
if (error < 0) {
return error;
if (error < 0)
return error;
}
/* refresh wd data */
sm->flags &=
~(GIT_SUBMODULE_STATUS_IN_WD |
GIT_SUBMODULE_STATUS__WD_OID_VALID |
GIT_SUBMODULE_STATUS__WD_FLAGS);
error = submodule_load_from_wd_lite(sm);
}
/* refresh wd data */
sm->flags &=
~(GIT_SUBMODULE_STATUS_IN_WD | GIT_SUBMODULE_STATUS__WD_OID_VALID |
GIT_SUBMODULE_STATUS__WD_FLAGS);
if (error == 0 && (error = submodule_update_index(sm)) == 0)
error = submodule_update_head(sm);
return submodule_load_from_wd_lite(sm);
return error;
}
static void submodule_copy_oid_maybe(