diff options
| author | Michael Lukashov <michael.lukashov@gmail.com> | 2010-02-16 23:42:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-17 15:11:33 -0800 |
| commit | 06b65939b083ba1b71043005bf83b4883e98264e (patch) | |
| tree | 6e4cc7e05c5de790d78abbbdc1f5cd863a38ec7a /merge-recursive.c | |
| parent | e923eaeb901ff056421b9007adcbbce271caa7b6 (diff) | |
| download | git-06b65939b083ba1b71043005bf83b4883e98264e.tar.gz git-06b65939b083ba1b71043005bf83b4883e98264e.tar.xz | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index cb53b01c1..195ebf974 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -599,23 +599,6 @@ struct merge_file_info merge:1; }; -static void fill_mm(const unsigned char *sha1, mmfile_t *mm) -{ - unsigned long size; - enum object_type type; - - if (!hashcmp(sha1, null_sha1)) { - mm->ptr = xstrdup(""); - mm->size = 0; - return; - } - - mm->ptr = read_sha1_file(sha1, &type, &size); - if (!mm->ptr || type != OBJ_BLOB) - die("unable to read blob object %s", sha1_to_hex(sha1)); - mm->size = size; -} - static int merge_3way(struct merge_options *o, mmbuffer_t *result_buf, struct diff_filespec *one, @@ -653,9 +636,9 @@ static int merge_3way(struct merge_options *o, name2 = xstrdup(mkpath("%s", branch2)); } - fill_mm(one->sha1, &orig); - fill_mm(a->sha1, &src1); - fill_mm(b->sha1, &src2); + read_mmblob(&orig, one->sha1); + read_mmblob(&src1, a->sha1); + read_mmblob(&src2, b->sha1); merge_status = ll_merge(result_buf, a->path, &orig, &src1, name1, &src2, name2, |