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 <gitster@pobox.com>
This commit is contained in:
parent
6c53e7ac04
commit
79418599e7
@ -574,17 +574,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
|
|||||||
pathspec = get_pathspec(prefix, argv + i);
|
pathspec = get_pathspec(prefix, argv + i);
|
||||||
|
|
||||||
/* Verify that the pathspec matches the prefix */
|
/* Verify that the pathspec matches the prefix */
|
||||||
if (pathspec) {
|
if (pathspec)
|
||||||
if (argc != i) {
|
|
||||||
int cnt;
|
|
||||||
for (cnt = 0; pathspec[cnt]; cnt++)
|
|
||||||
;
|
|
||||||
if (cnt != (argc - i))
|
|
||||||
exit(1); /* error message already given */
|
|
||||||
}
|
|
||||||
prefix = verify_pathspec(prefix);
|
prefix = verify_pathspec(prefix);
|
||||||
} else if (argc != i)
|
|
||||||
exit(1); /* error message already given */
|
|
||||||
|
|
||||||
/* Treat unmatching pathspec elements as errors */
|
/* Treat unmatching pathspec elements as errors */
|
||||||
if (pathspec && error_unmatch) {
|
if (pathspec && error_unmatch) {
|
||||||
|
Loading…
Reference in New Issue
Block a user