From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Jun 2016 18:01:04 +0000 (-0700)
Subject: Merge branch 'rs/xdiff-hunk-with-func-line'
X-Git-Tag: v2.10.0-rc0~193
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d15c05a5d016bfd637fa1966951ae0686d17272e;p=git-core%2Fgit.git

Merge branch 'rs/xdiff-hunk-with-func-line'

"git show -W" (extend hunks to cover the entire function, delimited
by lines that match the "funcname" pattern) used to show the entire
file when a change added an entire function at the end of the file,
which has been fixed.

* rs/xdiff-hunk-with-func-line:
  xdiff: fix merging of appended hunk with -W
  grep: -W: don't extend context to trailing empty lines
  t7810: add test for grep -W and trailing empty context lines
  xdiff: don't trim common tail with -W
  xdiff: -W: don't include common trailing empty lines in context
  xdiff: ignore empty lines before added functions with -W
  xdiff: handle appended chunks better with -W
  xdiff: factor out match_func_rec()
  t4051: rewrite, add more tests
---

d15c05a5d016bfd637fa1966951ae0686d17272e