delta/git.git, branch rs/include-comments-before-the-function-header

grep: show non-empty lines before functions with -W

2017-11-21T00:36:06+00:00

Non-empty lines before a function definition are most likely comments
for that function and thus relevant.  Include them in function context.

Such a non-empty line might also belong to the preceding function if
there is no separating blank line.  Stop extending the context upwards
also at the next function line to make sure only one extra function body
is shown at most.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

grep: update boundary variable for pre-context

2017-11-21T00:36:06+00:00

Function context can be bigger than -A/-B/-C context.  To find the
beginning of the combined context we search backwards.  Currently we
check at each loop iteration what we're looking for and determine the
effective upper boundary based on that.

Simplify this a bit by setting the variable "from" to the lowest unshown
line number up front if we're looking for a function line and set it
back to the required -B/-C context line number when we find one.  This
prepares the ground for the next patch; no functional change intended.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

t7810: improve check of -W with user-defined function lines

2017-11-21T00:36:06+00:00

The check for function context (-W) together with user-defined function
line patterns reuses hello.c and pretends it's written in a language in
which function lines contain either "printf" or a trailing curly brace.
That's a bit obscure.

Make the test easier to read by adding a small PowerShell script, using
a simple, but meaningful expression, and separating out checks for
different aspects into dedicated tests instead of simply matching the
whole output byte for byte.

Also include a test for showing comments before function lines like git

Signed-off-by: Junio C Hamano

xdiff: show non-empty lines before functions with -W

2017-11-21T00:36:06+00:00

Non-empty lines before a function definition are most likely comments
for that function and thus relevant.  Include them in function context.

Such a non-empty line might also belong to the preceeding function if
there is no separating blank line.  Stop extending the context upwards
also at the next function line to make sure only one extra function body
is shown at most.

Original-patch-by: Vegard Nossum 
Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

xdiff: factor out is_func_rec()

2017-11-21T00:36:06+00:00

Add a helper for checking if a given record is a function line.  It
frees callers from having to deal with the buffer arguments of
match_func_rec().

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

t4051: add test for comments preceding function lines

2017-11-21T00:36:06+00:00

When showing function context it would be helpful to show comments
immediately before declarations, as they are most likely relevant.

Add a test for that, but without specifying the choice of lines too
rigidly in the test---we may want to stop before and not include
"/*" in the future, for example.

Signed-off-by: Rene Scharfe 
Signed-off-by: Junio C Hamano

Sync with maint

2017-11-15T03:17:43+00:00

RelNotes: the fourth batch for 2.16

2017-11-15T03:17:08+00:00

Signed-off-by: Junio C Hamano

Merge branch 'bp/read-index-from-skip-verification'

2017-11-15T03:14:37+00:00

Drop (perhaps overly cautious) sanity check before using the index
read from the filesystem at runtime.

* bp/read-index-from-skip-verification:
  read_index_from(): speed index loading by skipping verification of the entry order

Merge branch 'bc/submitting-patches-in-asciidoc'

2017-11-15T03:14:36+00:00

The SubmittingPatches document has been converted to produce an
HTML version via AsciiDoc/Asciidoctor.

* bc/submitting-patches-in-asciidoc:
  Documentation: convert SubmittingPatches to AsciiDoc
  Documentation: enable compat-mode for Asciidoctor