diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-10 22:56:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-10 22:56:17 (GMT) |
| commit | ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4 (patch) | |
| tree | 95b3ad81be30f2d56be61e1a68c06ea6a450f93d /builtin | |
| parent | 9488c18923f40573b692dbb8ea9c85c3cb4550a7 (diff) | |
| parent | f950eb956092831730182daa7160eaa352277fa9 (diff) | |
| download | git-ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4.zip git-ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4.tar.gz git-ca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4.tar.bz2 | |
Merge branch 'cb/common-prefix-unification'
* cb/common-prefix-unification:
rename pathspec_prefix() to common_prefix() and move to dir.[ch]
consolidate pathspec_prefix and common_prefix
remove prefix argument from pathspec_prefix
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 5 | ||||
| -rw-r--r-- | builtin/ls-files.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index cbc9613..b9ab5ef 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -255,8 +255,9 @@ static int list_paths(struct string_list *list, const char *with_tree, m = xcalloc(1, i); if (with_tree) { - const char *max_prefix = pathspec_prefix(prefix, pattern); - overlay_tree_on_cache(with_tree, max_prefix); + char *max_prefix = common_prefix(pattern); + overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix); + free(max_prefix); } for (i = 0; i < active_nr; i++) { diff --git a/builtin/ls-files.c b/builtin/ls-files.c index e8a800d..7cff175 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -545,7 +545,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) strip_trailing_slash_from_submodules(); /* Find common prefix for all pathspec's */ - max_prefix = pathspec_prefix(prefix, pathspec); + max_prefix = common_prefix(pathspec); max_prefix_len = max_prefix ? strlen(max_prefix) : 0; /* Treat unmatching pathspec elements as errors */ |