From 531be3e8c6e8ec08db9798e7837a5abf933cc650 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 14 Jul 2016 22:59:37 -0400 Subject: [PATCH] apply: compare preimage to image Compare the preimage to the image; don't compare the preimage to itself. --- src/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apply.c b/src/apply.c index 876860754..e982ab682 100644 --- a/src/apply.c +++ b/src/apply.c @@ -97,7 +97,7 @@ static bool match_hunk( git_diff_line *preimage_line = git_vector_get(&preimage->lines, i); git_diff_line *image_line = git_vector_get(&image->lines, linenum + i); - if (preimage_line->content_len != preimage_line->content_len || + if (preimage_line->content_len != image_line->content_len || memcmp(preimage_line->content, image_line->content, image_line->content_len) != 0) { match = 0; break;