diff options
| author | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
|---|---|---|
| committer | joshaber <joshaber@gmail.com> | 2015-07-22 11:33:18 -0400 |
| commit | 9830fbba05ef66325f929a09407abc45ab85847d (patch) | |
| tree | dac363428f4705a632719e03b8b77f2d32ce2bb3 /src/submodule.c | |
| parent | cf198fdf2a044d2e2f0675c2c6b1cd9cdbcf4fcf (diff) | |
| parent | 42156d561723e92ffe597885719aa63abfe0795c (diff) | |
| download | libgit2-fix-init-ordering.tar.gz | |
Merge branch 'master' into fix-init-orderingfix-init-ordering
Diffstat (limited to 'src/submodule.c')
| -rw-r--r-- | src/submodule.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/submodule.c b/src/submodule.c index 17e1a3561..892c98304 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1385,7 +1385,7 @@ int git_submodule_reload(git_submodule *sm, int force) git_buf_sets(&path, "submodule\\."); git_buf_text_puts_escape_regex(&path, sm->name); - git_buf_puts(&path, ".*"); + git_buf_puts(&path, "\\..*"); if (git_buf_oom(&path)) { error = -1; @@ -1647,7 +1647,7 @@ static int submodule_load_from_config( } else { khiter_t pos; git_strmap *map = data->map; - pos = git_strmap_lookup_index(map, name.ptr); + pos = git_strmap_lookup_index(map, path ? path : name.ptr); if (git_strmap_valid_index(map, pos)) { sm = git_strmap_value_at(map, pos); } else { |