From 79418599e7221ef10641cf9cc07018c25b4d0310 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 6 Mar 2008 23:50:51 -0800 Subject: Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec()) When get_pathspec() was originally made absolute-path capable, we botched the interface to it, without dying inside the function when given a path that is outside the work tree, and made it the responsibility of callers to check the condition in a roundabout way. This is made unnecessary with the previous patch. Signed-off-by: Junio C Hamano --- builtin-ls-files.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/builtin-ls-files.c b/builtin-ls-files.c index 25dbfb4499..dc7eab89b3 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -574,17 +574,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) pathspec = get_pathspec(prefix, argv + i); /* Verify that the pathspec matches the prefix */ - if (pathspec) { - if (argc != i) { - int cnt; - for (cnt = 0; pathspec[cnt]; cnt++) - ; - if (cnt != (argc - i)) - exit(1); /* error message already given */ - } + if (pathspec) prefix = verify_pathspec(prefix); - } else if (argc != i) - exit(1); /* error message already given */ /* Treat unmatching pathspec elements as errors */ if (pathspec && error_unmatch) { -- cgit v1.2.3