summaryrefslogtreecommitdiff
path: root/builtin/ls-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-10 22:56:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-10 22:56:17 (GMT)
commitca3ef81ad78dcbaecd2bf03e22a5bb9d1fa5eff4 (patch)
tree95b3ad81be30f2d56be61e1a68c06ea6a450f93d /builtin/ls-files.c
parent9488c18923f40573b692dbb8ea9c85c3cb4550a7 (diff)
parentf950eb956092831730182daa7160eaa352277fa9 (diff)
downloadgit-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/ls-files.c')
-rw-r--r--builtin/ls-files.c2
1 files changed, 1 insertions, 1 deletions
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 */