From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 8 Apr 2016 21:29:12 +0000 (-0700)
Subject: Merge branch 'nd/apply-report-skip'
X-Git-Tag: v2.9.0-rc0~142
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11cfcc579a47c8873bccde835a39b3589c1e78ab?hp=efe778c5ceebdbb67147b4ce633bd268e0afe409

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
---

diff --git a/builtin/apply.c b/builtin/apply.c
index 42c610e2ec..c993333f9f 100644
--- 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++;
 		}