delta/git.git, branch rs/diff-whole-function

diff: add option to show whole functions as context

2011-10-10T19:05:07+00:00

Add the option -W/--function-context to git diff.  It is similar to
the same option of git grep and expands the context of change hunks
so that the whole surrounding function is shown.  This "natural"
context can allow changes to be understood better.

Note: GNU patch doesn't like diffs generated with the new option;
it seems to expect context lines to be the same before and after
changes.  git apply doesn't complain.

This implementation has the same shortcoming as the one in grep,
namely that there is no way to explicitly find the end of a
function.  That means that a few lines of extra context are shown,
right up to the next recognized function begins.  It's already
useful in its current form, though.

The function get_func_line() in xdiff/xemit.c is extended to work
forward as well as backward to find post-context as well as
pre-context.  It returns the position of the first found matching
line.  The func_line parameter is made optional, as we don't need
it for -W.

The enhanced function is then used in xdl_emit_diff() to extend
the context as needed.  If the added context overlaps with the
next change, it is merged into the current hunk.

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

xdiff: factor out get_func_line()

2011-10-10T18:59:30+00:00

Move the code to search for a function line to be shown in the hunk
header into its own function and to make returning the length-limited
result string easier, introduce struct func_line.

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

Git 1.7.7

2011-09-30T21:20:57+00:00

Signed-off-by: Junio C Hamano

templates/hooks--*: remove sample hooks without any functionality

2011-09-27T17:00:35+00:00

Remove the sample post-commit and post-receive hooks.  The sample
post-commit doesn't contain any sample functionality and the comments do
not provide more information than already found in the documentation.
The sample post-receive hooks doesn't provide any sample functionality
either and refers in the comments to a contrib hook that might be
installed in different locations on different systems, which isn't that
helpful.

Signed-off-by: Gerrit Pape 
Signed-off-by: Junio C Hamano

contrib/hooks: adapt comment about Debian install location for contrib hooks

2011-09-26T23:39:34+00:00

Placing the contrib hooks into /usr/share/doc/ wasn't a good idea in the
first place.  According to the Debian policy they should be located in
/usr/share/git-core/, so let's put them there.

Thanks to Bill Allombert for reporting this through
 http://bugs.debian.org/640949

Signed-off-by: Gerrit Pape 
Signed-off-by: Junio C Hamano

Merge branch 'jc/namespace-doc-with-old-asciidoc'

2011-09-26T17:50:08+00:00

* jc/namespace-doc-with-old-asciidoc:
  Documentation/gitnamespaces.txt: cater to older asciidoc

Git 1.7.7-rc3

2011-09-23T22:35:57+00:00

Signed-off-by: Junio C Hamano

Merge 1.7.6.4 in

2011-09-23T22:31:08+00:00

Signed-off-by: Junio C Hamano

merge-recursive: Do not look at working tree during a virtual ancestor merge

2011-09-23T22:21:01+00:00

Fix another instance of a recursive merge incorrectly paying attention to
the working tree file during a virtual ancestor merge, that resulted in
spurious and useless "addinfo_cache failed" error message.

Signed-off-by: Junio C Hamano

Git 1.7.6.4

2011-09-23T21:43:05+00:00

Signed-off-by: Junio C Hamano