From 06b65939b083ba1b71043005bf83b4883e98264e Mon Sep 17 00:00:00 2001 From: Michael Lukashov Date: Tue, 16 Feb 2010 23:42:55 +0000 Subject: refactor duplicated fill_mm() in checkout and merge-recursive The following function is duplicated: fill_mm Move it to xdiff-interface.c and rename it 'read_mmblob', as suggested by Junio C Hamano. Also, change parameters order for consistency with read_mmfile(). Signed-off-by: Michael Lukashov Signed-off-by: Junio C Hamano --- xdiff-interface.h | 1 + 1 file changed, 1 insertion(+) (limited to 'xdiff-interface.h') diff --git a/xdiff-interface.h b/xdiff-interface.h index 55572c39a..abba70c16 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -18,6 +18,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); int buffer_is_binary(const char *ptr, unsigned long size); extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); -- cgit v1.2.1