]> git.ipfire.org Git - thirdparty/git.git/commitdiff
apply: report patch skipping in verbose mode
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Thu, 24 Mar 2016 11:56:19 +0000 (18:56 +0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Mar 2016 17:18:31 +0000 (10:18 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c

index 42c610e2ec180e789fdae4bc637dd96f533d1e10..c993333f9f6bd397d32c8cdc299100930a37de24 100644 (file)
@@ -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++;
                }