remove prefix argument from pathspec_prefix
Passing a prefix to a function that is supposed to find the prefix is strange. And it's really only used if the pathspec is NULL. Make the callers handle this case instead. As we are always returning a fresh copy of a string (or NULL), change the type of the returned value to non-const "char *". Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
8894d53580
commit
5879f5684c
@ -257,8 +257,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 = pathspec_prefix(pattern);
|
||||
overlay_tree_on_cache(with_tree, max_prefix ? max_prefix : prefix);
|
||||
free(max_prefix);
|
||||
}
|
||||
|
||||
for (i = 0; i < active_nr; i++) {
|
||||
|
Reference in New Issue
Block a user