summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-09-05 20:08:02 +0000
committerJunio C Hamano <gitster@pobox.com>2016-09-07 12:59:42 -0700
commitd449347d080cd97a9d6dc029014383d4817e34bf (patch)
treed64c39be3f1cd8f5833ac1a9dde0664de686a0bf /xdiff-interface.h
parente910bb1e79d53d43d07013b4d7e58c9f3ec53c8d (diff)
downloadgit-d449347d080cd97a9d6dc029014383d4817e34bf.tar.gz
Convert read_mmblob to take struct object_id.
Since all of its callers have been updated, convert read_mmblob to take a pointer to struct object_id. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index fbb5a1c394..6f6ba9095d 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -1,6 +1,7 @@
#ifndef XDIFF_INTERFACE_H
#define XDIFF_INTERFACE_H
+#include "cache.h"
#include "xdiff/xdiff.h"
/*
@@ -20,7 +21,7 @@ int parse_hunk_header(char *line, int len,
int *ob, int *on,
int *nb, int *nn);
int read_mmfile(mmfile_t *ptr, const char *filename);
-void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
+void read_mmblob(mmfile_t *ptr, const struct object_id *oid);
int buffer_is_binary(const char *ptr, unsigned long size);
extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);