diff options
| author | Alan Rogers <alan@github.com> | 2013-06-28 13:16:13 +1000 |
|---|---|---|
| committer | Alan Rogers <alan@github.com> | 2013-06-28 13:16:13 +1000 |
| commit | 7c7cdaea8c9212c4d902440c3095212fb99f5a09 (patch) | |
| tree | e518e9d609a12dc6dd88344f8df6bd89bc7169c2 | |
| parent | c8a39f9ee3ce8aa73a489b72006f0e3c27cc5911 (diff) | |
| download | libgit2-7c7cdaea8c9212c4d902440c3095212fb99f5a09.tar.gz | |
Don't bail out after failing to read submodule configs.
As the config may only exist in only one of (or neither of?) the HEAD
or the index.
| -rw-r--r-- | src/submodule.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/submodule.c b/src/submodule.c index 89eba2aa4..a59fb897c 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1269,13 +1269,11 @@ static int load_submodule_config(git_repository *repo) /* add submodule information from index */ - if ((error = load_submodule_config_from_index(repo, &gitmodules_oid)) < 0) - goto cleanup; + load_submodule_config_from_index(repo, &gitmodules_oid); /* add submodule information from HEAD */ - if ((error = load_submodule_config_from_head(repo, &gitmodules_oid)) < 0) - goto cleanup; + load_submodule_config_from_head(repo, &gitmodules_oid); /* add submodule information from .gitmodules */ |