diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-10 19:13:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 19:13:45 (GMT) |
| commit | 1191d606bb2b544e3d8429d07f8ff43aae7d8145 (patch) | |
| tree | 40514c12554e99ac408b064627027f70bbf92ebf /builtin | |
| parent | 7f18fadcbc409c24d9d76a913eb280db74b8a89a (diff) | |
| parent | 2b56bb7a87ab429c225f6325f2870cbeac0d19f9 (diff) | |
| download | git-1191d606bb2b544e3d8429d07f8ff43aae7d8145.zip git-1191d606bb2b544e3d8429d07f8ff43aae7d8145.tar.gz git-1191d606bb2b544e3d8429d07f8ff43aae7d8145.tar.bz2 | |
Merge branch 'sb/submodule-module-list-fix' into maint
A helper function "git submodule" uses since v2.7.0 to list the
modules that match the pathspec argument given to its subcommands
(e.g. "submodule add <repo> <path>") has been fixed.
* sb/submodule-module-list-fix:
submodule helper list: respect correct path prefix
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/submodule--helper.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index f4c3eff..ed764c9 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -22,17 +22,12 @@ static int module_list_compute(int argc, const char **argv, struct module_list *list) { int i, result = 0; - char *max_prefix, *ps_matched = NULL; - int max_prefix_len; + char *ps_matched = NULL; parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL | PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, prefix, argv); - /* Find common prefix for all pathspec's */ - max_prefix = common_prefix(pathspec); - max_prefix_len = max_prefix ? strlen(max_prefix) : 0; - if (pathspec->nr) ps_matched = xcalloc(pathspec->nr, 1); @@ -44,7 +39,7 @@ static int module_list_compute(int argc, const char **argv, if (!S_ISGITLINK(ce->ce_mode) || !match_pathspec(pathspec, ce->name, ce_namelen(ce), - max_prefix_len, ps_matched, 1)) + 0, ps_matched, 1)) continue; ALLOC_GROW(list->entries, list->nr + 1, list->alloc); @@ -57,7 +52,6 @@ static int module_list_compute(int argc, const char **argv, */ i++; } - free(max_prefix); if (ps_matched && report_path_error(ps_matched, pathspec, prefix)) result = -1; |