| commit | 2e464dd5b220d4d2d8a16d5c43efe7af3c9adda9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 May 2012 22:22:13 +0000 (17 15:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 17 May 2012 22:22:13 +0000 (17 15:22 -0700) | ||
| tree | e36a8a20733792bdcad789363fb0f50985123d11 | treesnapshot (tar.gz zip) |
| parent | 8be441ea1fbd6e39952c5c314014162900c2c148 | commitdiff |
| parent | 85c20c304f991b33b59fbf00182a66f5cf6d2960 | commitdiff |
Merge branch 'rs/xdiff-lose-emit-func'
Simplifies the interface between the implementation of "blame" and
underlying xdiff engine, and removes a lot of unused or unnecessary code
from the latter.
By René Scharfe (6) and Ramsay Jones (1)
* rs/xdiff-lose-emit-func:
builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
xdiff: remove unused functions
xdiff: remove emit_func() and xdi_diff_hunks()
blame: factor out helper for calling xdi_diff()
blame: use hunk_func(), part 2
blame: use hunk_func(), part 1
xdiff: add hunk_func()
Simplifies the interface between the implementation of "blame" and
underlying xdiff engine, and removes a lot of unused or unnecessary code
from the latter.
By René Scharfe (6) and Ramsay Jones (1)
* rs/xdiff-lose-emit-func:
builtin/blame.c: Fix a "Using plain integer as NULL pointer" warning
xdiff: remove unused functions
xdiff: remove emit_func() and xdi_diff_hunks()
blame: factor out helper for calling xdi_diff()
blame: use hunk_func(), part 2
blame: use hunk_func(), part 1
xdiff: add hunk_func()