summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorMichael Lukashov <michael.lukashov@gmail.com>2010-02-16 23:42:55 +0000
committerJunio C Hamano <gitster@pobox.com>2010-02-17 15:11:33 -0800
commit06b65939b083ba1b71043005bf83b4883e98264e (patch)
tree6e4cc7e05c5de790d78abbbdc1f5cd863a38ec7a /xdiff-interface.h
parente923eaeb901ff056421b9007adcbbce271caa7b6 (diff)
downloadgit-06b65939b083ba1b71043005bf83b4883e98264e.tar.gz
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 <michael.lukashov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r--xdiff-interface.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h
index 55572c39a1..abba70c16b 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);