diff options
| author |  Patryk Obara <patryk.obara@gmail.com> | 2017-08-20 22:09:29 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-20 21:52:08 -0700 |
| commit | e3506559d476ccf94c923c30a15500b46204e146 (patch) | |
| tree | 5b881cce8baa687c519ab2265155cc850fe86291 /builtin/difftool.c | |
| parent | sha1_file: convert index_path to struct object_id (diff) | |
| download | tgif-e3506559d476ccf94c923c30a15500b46204e146.tar.xz | |
sha1_file: convert index_fd to struct object_id
Convert all remaining callers as well.
Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 8864d846f8..b2d3ba7539 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -111,7 +111,7 @@ static int use_wt_file(const char *workdir, const char *name, int fd = open(buf.buf, O_RDONLY); if (fd >= 0 && - !index_fd(wt_oid.hash, fd, &st, OBJ_BLOB, name, 0)) { + !index_fd(&wt_oid, fd, &st, OBJ_BLOB, name, 0)) { if (is_null_oid(oid)) { oidcpy(oid, &wt_oid); use = 1; |