Merge branch 'nd/apply-report-skip'

"git apply -v" learned to report paths in the patch that were
skipped via --include/--exclude mechanism or being outside the
current working directory.

* nd/apply-report-skip:
  apply: report patch skipping in verbose mode
This commit is contained in:
Junio C Hamano 2016-04-08 14:29:12 -07:00
Родитель efe778c5ce 3f5794493c
Коммит 11cfcc579a
1 изменённых файлов: 2 добавлений и 0 удалений

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

@ -4383,6 +4383,8 @@ static int apply_patch(int fd, const char *filename, int options)
listp = &patch->next;
}
else {
if (apply_verbosely)
say_patch_name(stderr, _("Skipped patch '%s'."), patch);
free_patch(patch);
skipped_patch++;
}