From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Thu, 24 Mar 2016 11:56:19 +0000 (+0700)
Subject: apply: report patch skipping in verbose mode
X-Git-Tag: v2.9.0-rc0~142^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f5794493c7a0ba2bba0278b9129d98df343d341;p=thirdparty%2Fgit.git

apply: report patch skipping in verbose mode

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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++;
 		}