Merge branch 'cc/fetch-error-message-fix'

Error message fix.

* cc/fetch-error-message-fix:
  fetch: fix extensions.partialclone name in error message
This commit is contained in:
Junio C Hamano 2019-01-29 12:47:53 -08:00
Родитель e6dc1ea059 e01378753d
Коммит 61c51acf7d
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -1478,7 +1478,8 @@ static inline void fetch_one_setup_partial(struct remote *remote)
*/
if (strcmp(remote->name, repository_format_partial_clone)) {
if (filter_options.choice)
die(_("--filter can only be used with the remote configured in core.partialClone"));
die(_("--filter can only be used with the remote "
"configured in extensions.partialclone"));
return;
}
@ -1646,7 +1647,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
result = fetch_one(remote, argc, argv, prune_tags_ok);
} else {
if (filter_options.choice)
die(_("--filter can only be used with the remote configured in core.partialClone"));
die(_("--filter can only be used with the remote "
"configured in extensions.partialclone"));
/* TODO should this also die if we have a previous partial-clone? */
result = fetch_multiple(&list);
}