diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-29 00:59:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-29 00:59:28 +0300 |
| commit | 92cdfd21313c5bf5657d4ac2d3e6ae7af7e9ce94 (patch) | |
| tree | 1ee5bd8057292fc6dfa9edc58b3c2cc7b990f8ab /line-log.c | |
| parent | f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07 (diff) | |
| parent | 83c4d380171a2ecd24dd2e04072692ec54a7aaa5 (diff) | |
Merge branch 'jk/xdiff-memory-limits' into maint-2.3
Diffstat (limited to 'line-log.c')
| -rw-r--r-- | line-log.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/line-log.c b/line-log.c index 1a6bc5921b..d4e29a574f 100644 --- a/line-log.c +++ b/line-log.c @@ -325,7 +325,7 @@ static int collect_diff_cb(long start_a, long count_a, return 0; } -static void collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges *out) +static int collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges *out) { struct collect_diff_cbdata cbdata = {NULL}; xpparam_t xpp; @@ -340,7 +340,7 @@ static void collect_diff(mmfile_t *parent, mmfile_t *target, struct diff_ranges xecfg.hunk_func = collect_diff_cb; memset(&ecb, 0, sizeof(ecb)); ecb.priv = &cbdata; - xdi_diff(parent, target, &xpp, &xecfg, &ecb); + return xdi_diff(parent, target, &xpp, &xecfg, &ecb); } /* @@ -1030,7 +1030,8 @@ static int process_diff_filepair(struct rev_info *rev, } diff_ranges_init(&diff); - collect_diff(&file_parent, &file_target, &diff); + if (collect_diff(&file_parent, &file_target, &diff)) + die("unable to generate diff for %s", pair->one->path); /* NEEDSWORK should apply some heuristics to prevent mismatches */ free(rg->path); |