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
git-mirror · Apr 8, 2016 · 11cfcc5 · 11cfcc5
2 parents efe778c + 3f57944
commit 11cfcc5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/builtin/apply.c b/builtin/apply.c
@@ -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++;
 		}