summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Rogers <alan@github.com>2013-06-28 14:31:07 +1000
committerAlan Rogers <alan@github.com>2013-06-28 14:31:07 +1000
commite961a62d9a0feed1df2497c013a02869673a92d2 (patch)
tree118c9157ec299dcd1d0a880ef448e0967a0bd19d
parent7c7cdaea8c9212c4d902440c3095212fb99f5a09 (diff)
downloadlibgit2-e961a62d9a0feed1df2497c013a02869673a92d2.tar.gz
We DO still need load the config from the index apparently.
-rw-r--r--src/submodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/submodule.c b/src/submodule.c
index a59fb897c..efea9ed2e 100644
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -1269,7 +1269,8 @@ static int load_submodule_config(git_repository *repo)
/* add submodule information from index */
- load_submodule_config_from_index(repo, &gitmodules_oid);
+ if ((error = load_submodule_config_from_index(repo, &gitmodules_oid)) < 0)
+ goto cleanup;
/* add submodule information from HEAD */