diff options
| author | Brandon Williams <bmwill@google.com> | 2017-06-13 00:13:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 20:40:51 +0200 |
| commit | a33e0b2a77d7010ba8bf0e025fffaf98f464a938 (patch) | |
| tree | 8a29e638dabfd58be446888daa618d24014d0ca5 /ll-merge.c | |
| parent | convert: convert convert_to_git to take an index (diff) | |
| download | git-a33e0b2a77d7010ba8bf0e025fffaf98f464a938.tar.xz git-a33e0b2a77d7010ba8bf0e025fffaf98f464a938.zip | |
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 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index ac0d4a5d78..d7eafb61a6 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -339,7 +339,7 @@ static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attr static void normalize_file(mmfile_t *mm, const char *path) { struct strbuf strbuf = STRBUF_INIT; - if (renormalize_buffer(path, mm->ptr, mm->size, &strbuf)) { + if (renormalize_buffer(&the_index, path, mm->ptr, mm->size, &strbuf)) { free(mm->ptr); mm->size = strbuf.len; mm->ptr = strbuf_detach(&strbuf, NULL); |