diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 13:37:27 (GMT) |
| commit | 39d23dfa409e51844ddda99599927092c8300f12 (patch) | |
| tree | f4975a66a1fb9c33a875fe72042e9b7c75519597 /builtin/rerere.c | |
| parent | f22838aa7a6dcf308a3307ba17f8afa40989ad3a (diff) | |
| parent | 5eade0746e1daf659a9559d804068f9f31614625 (diff) | |
| download | git-39d23dfa409e51844ddda99599927092c8300f12.zip git-39d23dfa409e51844ddda99599927092c8300f12.tar.gz git-39d23dfa409e51844ddda99599927092c8300f12.tar.bz2 | |
Merge branch 'jk/xdiff-interface'
The interface into "xdiff" library used to discover the offset and
size of a generated patch hunk by first formatting it into the
textual hunk header "@@ -n,m +k,l @@" and then parsing the numbers
out. A new interface has been introduced to allow callers a more
direct access to them.
* jk/xdiff-interface:
xdiff-interface: drop parse_hunk_header()
range-diff: use a hunk callback
diff: convert --check to use a hunk callback
combine-diff: use an xdiff hunk callback
diff: use hunk callback for word-diff
diff: discard hunk headers for patch-ids earlier
diff: avoid generating unused hunk header lines
xdiff-interface: provide a separate consume callback for hunks
xdiff: provide a separate emit callback for hunks
Diffstat (limited to 'builtin/rerere.c')
| -rw-r--r-- | builtin/rerere.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index e89ccbc..d78eeae 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -41,7 +41,8 @@ static int diff_two(const char *file1, const char *label1, xpp.flags = 0; memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; - ecb.outf = outf; + ecb.out_hunk = NULL; + ecb.out_line = outf; ret = xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb); free(minus.ptr); |