Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
gc --auto: exclude base pack if not enough mem to "repack -ad"
[gitweb.git]
/
builtin
/
difftool.c
diff --git
a/builtin/difftool.c
b/builtin/difftool.c
index bcc79d1888f2217bcb380ffb1e7178c100a41e8e..ee8dce019e1ca04111de185b5f47c12076b32a0c 100644
(file)
--- a/
builtin/difftool.c
+++ b/
builtin/difftool.c
@@
-306,7
+306,7
@@
static char *get_symlink(const struct object_id *oid, const char *path)
} else {
enum object_type type;
unsigned long size;
- data = read_
sha1_file(oid->hash
, &type, &size);
+ data = read_
object_file(oid
, &type, &size);
if (!data)
die(_("could not read object %s for symlink %s"),
oid_to_hex(oid), path);