Commit 531be3e8c6e8ec08db9798e7837a5abf933cc650

Edward Thomson 2016-07-14T22:59:37

apply: compare preimage to image Compare the preimage to the image; don't compare the preimage to itself.

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/apply.c b/src/apply.c
index 8768607..e982ab6 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;