diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 15:57:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 16:48:11 (GMT) |
| commit | 58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8 (patch) | |
| tree | 14a33e0559d194d11f89ac2cdf61789db64dffcb /builtin/difftool.c | |
| parent | a7edadda593e34243c1cd3b3db750d502acf9b83 (diff) | |
| download | git-58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8.zip git-58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8.tar.gz git-58bf2a4cc7a929d2fe0ff30eda86fcec54aef0f8.tar.bz2 | |
sha1-file.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@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 cdd585c..e7023e3 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -112,7 +112,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, fd, &st, OBJ_BLOB, name, 0)) { + !index_fd(&the_index, &wt_oid, fd, &st, OBJ_BLOB, name, 0)) { if (is_null_oid(oid)) { oidcpy(oid, &wt_oid); use = 1; |