summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-03-15 14:22:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-15 14:22:02 -0700
commit8506588107791336e23157543d243b8118943934 (patch)
tree25c9a24dcac05b93a2fea5e663039d4b7af2bb6d /builtin
parentMerge branch 'jc/maint-apply-no-double-patch' (diff)
parentapply -v: show offset count when patch did not apply exactly (diff)
downloadtgif-8506588107791336e23157543d243b8118943934.tar.xz
Merge branch 'jc/maint-apply-report-offset'
* jc/maint-apply-report-offset: apply -v: show offset count when patch did not apply exactly
Diffstat (limited to 'builtin')
-rw-r--r--builtin/apply.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 04f56f850a..36e150768b 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -2437,7 +2437,8 @@ static void update_image(struct image *img,
}
static int apply_one_fragment(struct image *img, struct fragment *frag,
- int inaccurate_eof, unsigned ws_rule)
+ int inaccurate_eof, unsigned ws_rule,
+ int nth_fragment)
{
int match_beginning, match_end;
const char *patch = frag->patch;
@@ -2643,6 +2644,15 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
apply = 0;
}
+ if (apply_verbosely && applied_pos != pos) {
+ int offset = applied_pos - pos;
+ if (apply_in_reverse)
+ offset = 0 - offset;
+ fprintf(stderr,
+ "Hunk #%d succeeded at %d (offset %d lines).\n",
+ nth_fragment, applied_pos + 1, offset);
+ }
+
/*
* Warn if it was necessary to reduce the number
* of context lines.
@@ -2790,12 +2800,14 @@ static int apply_fragments(struct image *img, struct patch *patch)
const char *name = patch->old_name ? patch->old_name : patch->new_name;
unsigned ws_rule = patch->ws_rule;
unsigned inaccurate_eof = patch->inaccurate_eof;
+ int nth = 0;
if (patch->is_binary)
return apply_binary(img, patch);
while (frag) {
- if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule)) {
+ nth++;
+ if (apply_one_fragment(img, frag, inaccurate_eof, ws_rule, nth)) {
error("patch failed: %s:%ld", name, frag->oldpos);
if (!apply_with_reject)
return -1;