Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
parse-options: replace opterror() with optname()
[gitweb.git]
/
builtin
/
difftool.c
diff --git
a/builtin/difftool.c
b/builtin/difftool.c
index b41a9199ff441579655c91fc692211257e4e91ed..544b0e86397cb98ddfdad3cffdd983905ee36029 100644
(file)
--- 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;