diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:37:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:37:41 -0700 |
| commit | b7511571e3ecd6b81a47e42a52cf9b5160a3d6e9 (patch) | |
| tree | 56c67e4fdf0f4e30433939d3443543bc9c93851f /builtin | |
| parent | Merge branch 'bg/send-email-smtpdomain' (diff) | |
| parent | apply: Allow blank *trailing* context lines to match beyond EOF (diff) | |
| download | tgif-b7511571e3ecd6b81a47e42a52cf9b5160a3d6e9.tar.xz | |
Merge branch 'bg/apply-blank-trailing-context'
* bg/apply-blank-trailing-context:
apply: Allow blank *trailing* context lines to match beyond EOF
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index d56cabf5e2..8fc5ec31de 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 { |