X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin%2Fapply.c;h=8fc5ec31deae63122878bdb776921bcf656fb791;hb=30d00c395e3fb9f104a3f4a85f06a039c989cd8d;hp=d56cabf5e2a5fad1cf98d74c38b2623f7150033b;hpb=daa81c4a4a48a76e542293c025972e6a870fec9b;p=git.git

diff --git a/builtin/apply.c b/builtin/apply.c
index d56cabf5e..8fc5ec31d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1866,13 +1866,13 @@ static int match_fragment(struct image *img,
 		if (match_end && (preimage->nr + try_lno != img->nr))
 			return 0;
 	} else if (ws_error_action == correct_ws_error &&
-		   (ws_rule & WS_BLANK_AT_EOF) && match_end) {
+		   (ws_rule & WS_BLANK_AT_EOF)) {
 		/*
-		 * This hunk that matches at the end extends beyond
-		 * the end of img, and we are removing blank lines
-		 * at the end of the file.  This many lines from the
-		 * beginning of the preimage must match with img, and
-		 * the remainder of the preimage must be blank.
+		 * This hunk extends beyond the end of img, and we are
+		 * removing blank lines at the end of the file.  This
+		 * many lines from the beginning of the preimage must
+		 * match with img, and the remainder of the preimage
+		 * must be blank.
 		 */
 		preimage_limit = img->nr - try_lno;
 	} else {