diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 21:29:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 21:29:12 (GMT) |
| commit | 11cfcc579a47c8873bccde835a39b3589c1e78ab (patch) | |
| tree | bfcc2197e552e860978b6d12a0c780e2dd7077d0 /builtin | |
| parent | efe778c5ceebdbb67147b4ce633bd268e0afe409 (diff) | |
| parent | 3f5794493c7a0ba2bba0278b9129d98df343d341 (diff) | |
| download | git-11cfcc579a47c8873bccde835a39b3589c1e78ab.zip git-11cfcc579a47c8873bccde835a39b3589c1e78ab.tar.gz git-11cfcc579a47c8873bccde835a39b3589c1e78ab.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 42c610e..c993333 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++; } |