diff options
| author | Brandon Williams <bmwill@google.com> | 2017-06-13 01:13:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 21:40:51 +0300 |
| commit | a33e0b2a77d7010ba8bf0e025fffaf98f464a938 (patch) | |
| tree | 8a29e638dabfd58be446888daa618d24014d0ca5 /merge-recursive.c | |
| parent | 82b474e025e89cfa294e81611c81355a73dc23a2 (diff) | |
convert: convert renormalize_buffer to take an index
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ae5238d82c..eac12d4888 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1639,8 +1639,8 @@ static int blob_unchanged(struct merge_options *opt, * performed. Comparison can be skipped if both files are * unchanged since their sha1s have already been compared. */ - if (renormalize_buffer(path, o.buf, o.len, &o) | - renormalize_buffer(path, a.buf, a.len, &a)) + if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) | + renormalize_buffer(&the_index, path, a.buf, a.len, &a)) ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len)); error_return: |