summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-03-24 18:56:19 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-24 10:18:31 -0700
commit3f5794493c7a0ba2bba0278b9129d98df343d341 (patch)
tree4d16264d20fbc23ed5a21f2db3636bc74a5a6e54
parentMerge branch 'master' of git://github.com/git-l10n/git-po (diff)
downloadtgif-3f5794493c7a0ba2bba0278b9129d98df343d341.tar.xz
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>
-rw-r--r--builtin/apply.c2
1 files changed, 2 insertions, 0 deletions
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++;
}