apply: report patch skipping in verbose mode

pclouds · gitster · commit 3f5794493c7a · 2016-03-24T10:18:31.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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++;
 		}

Original file line number	Diff line number	Diff line change
`@@ -4383,6 +4383,8 @@ static int apply_patch(int fd, const char *filename, int options)`
`4383`	`4383`	`listp = &patch->next;`
`4384`	`4384`	`}`
`4385`	`4385`	`else {`
	`4386`	`+ if (apply_verbosely)`
	`4387`	`+ say_patch_name(stderr, _("Skipped patch '%s'."), patch);`
`4386`	`4388`	`free_patch(patch);`
`4387`	`4389`	`skipped_patch++;`
`4388`	`4390`	`}`