Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
request-pull: quote regex metacharacters in local ref
[gitweb.git]
/
builtin
/
difftool.c
diff --git
a/builtin/difftool.c
b/builtin/difftool.c
index eeb9e370b9c5b3d11fb9f4774aee7cdf952e3b51..a3ea60ea71428ee59ab20a67f6e9ccf76c841f85 100644
(file)
--- a/
builtin/difftool.c
+++ b/
builtin/difftool.c
@@
-324,7
+324,7
@@
static int checkout_path(unsigned mode, struct object_id *oid,
int ret;
ce = make_transient_cache_entry(mode, oid, path, 0);
- ret = checkout_entry(ce, state, NULL);
+ ret = checkout_entry(ce, state, NULL
, NULL
);
discard_cache_entry(ce);
return ret;