diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 19:16:54 -0700 |
| commit | 3adc4ec7b9e1d2118501728a75a5b93d971974fa (patch) | |
| tree | 807d65746060e9967d6d016b230730ef5fd24334 /line-log.c | |
| parent | be08dee9738eaaa0423885ed189c2b6ad8368cf0 (diff) | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| download | git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.gz git-3adc4ec7b9e1d2118501728a75a5b93d971974fa.tar.xz | |
Sync with v2.5.4
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 c12c69f05..626b22cc3 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); |