diff options
| author |  René Scharfe <l.s.r@web.de> | 2016-05-28 17:04:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-05-31 13:08:56 -0700 |
| commit | e0876bca4de44638a1cb51b03bdf0a40df631a80 (patch) | |
| tree | eb3fd50f21adb94deee1823a68467b43cb002e3b /t | |
| parent | xdiff: -W: don't include common trailing empty lines in context (diff) | |
| download | tgif-e0876bca4de44638a1cb51b03bdf0a40df631a80.tar.xz | |
xdiff: don't trim common tail with -W
The function trim_common_tail() exits early if context lines are
requested. If -U0 and -W are specified together then it can still trim
context lines that might belong to a changed function. As a result
that function is shown incompletely.
Fix that by calling trim_common_tail() only if no function context or
fixed context is requested. The parameter ctx is no longer needed now;
remove it.
While at it fix an outdated comment as well.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4051-diff-function-context.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh index 17616fe582..b6bb04ab82 100755 --- a/t/t4051-diff-function-context.sh +++ b/t/t4051-diff-function-context.sh @@ -145,7 +145,7 @@ test_expect_success ' context includes begin' ' grep "^ .*Begin of first part" long_common_tail.diff ' -test_expect_failure ' context includes end' ' +test_expect_success ' context includes end' ' grep "^ .*End of second part" long_common_tail.diff ' |