зеркало из https://github.com/microsoft/git.git
report_path_error(): drop unused prefix parameter
This hasn't been used since 17ddc66e70
(convert report_path_error to
take struct pathspec, 2013-07-14), as the names in the struct will have
already been prefixed when they were parsed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
df351c6e67
Коммит
c5c33504c9
|
@ -376,7 +376,7 @@ static int checkout_paths(const struct checkout_opts *opts,
|
|||
ps_matched,
|
||||
opts);
|
||||
|
||||
if (report_path_error(ps_matched, &opts->pathspec, opts->prefix)) {
|
||||
if (report_path_error(ps_matched, &opts->pathspec)) {
|
||||
free(ps_matched);
|
||||
return 1;
|
||||
}
|
||||
|
|
|
@ -235,7 +235,7 @@ static int commit_index_files(void)
|
|||
* and return the paths that match the given pattern in list.
|
||||
*/
|
||||
static int list_paths(struct string_list *list, const char *with_tree,
|
||||
const char *prefix, const struct pathspec *pattern)
|
||||
const struct pathspec *pattern)
|
||||
{
|
||||
int i, ret;
|
||||
char *m;
|
||||
|
@ -264,7 +264,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
|
|||
item->util = item; /* better a valid pointer than a fake one */
|
||||
}
|
||||
|
||||
ret = report_path_error(m, pattern, prefix);
|
||||
ret = report_path_error(m, pattern);
|
||||
free(m);
|
||||
return ret;
|
||||
}
|
||||
|
@ -454,7 +454,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
|
|||
die(_("cannot do a partial commit during a cherry-pick."));
|
||||
}
|
||||
|
||||
if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
|
||||
if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
|
||||
exit(1);
|
||||
|
||||
discard_cache();
|
||||
|
|
|
@ -680,7 +680,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
|
|||
|
||||
if (ps_matched) {
|
||||
int bad;
|
||||
bad = report_path_error(ps_matched, &pathspec, prefix);
|
||||
bad = report_path_error(ps_matched, &pathspec);
|
||||
if (bad)
|
||||
fprintf(stderr, "Did you forget to 'git add'?\n");
|
||||
|
||||
|
|
|
@ -348,7 +348,7 @@ static int module_list_compute(int argc, const char **argv,
|
|||
i++;
|
||||
}
|
||||
|
||||
if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
|
||||
if (ps_matched && report_path_error(ps_matched, pathspec))
|
||||
result = -1;
|
||||
|
||||
free(ps_matched);
|
||||
|
|
3
dir.c
3
dir.c
|
@ -502,8 +502,7 @@ int submodule_path_match(const struct index_state *istate,
|
|||
}
|
||||
|
||||
int report_path_error(const char *ps_matched,
|
||||
const struct pathspec *pathspec,
|
||||
const char *prefix)
|
||||
const struct pathspec *pathspec)
|
||||
{
|
||||
/*
|
||||
* Make sure all pathspec matched; otherwise it is an error.
|
||||
|
|
2
dir.h
2
dir.h
|
@ -220,7 +220,7 @@ extern int match_pathspec(const struct index_state *istate,
|
|||
const struct pathspec *pathspec,
|
||||
const char *name, int namelen,
|
||||
int prefix, char *seen, int is_dir);
|
||||
extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
|
||||
extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec);
|
||||
extern int within_depth(const char *name, int namelen, int depth, int max_depth);
|
||||
|
||||
extern int fill_directory(struct dir_struct *dir,
|
||||
|
|
Загрузка…
Ссылка в новой задаче