kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
brian m. carlson 2016-09-05 20:08:02 +00:00 committed by Junio C Hamano
parent e910bb1e79
commit d449347d08
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/apply.c
View File

@ -3435,9 +3435,9 @@ static int three_way_merge(struct image *image,
mmbuffer_t result = { NULL }; mmbuffer_t result = { NULL };
int status; int status;


read_mmblob(&base_file, base->hash); read_mmblob(&base_file, base);
read_mmblob(&our_file, ours->hash); read_mmblob(&our_file, ours);
read_mmblob(&their_file, theirs->hash); read_mmblob(&their_file, theirs);
status = ll_merge(&result, path, status = ll_merge(&result, path,
&base_file, "base", &base_file, "base",
&our_file, "ours", &our_file, "ours",

6
builtin/checkout.c
View File

@ -195,9 +195,9 @@ static int checkout_merged(int pos, struct checkout *state)
if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2])) if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2]))
return error(_("path '%s' does not have necessary versions"), path); return error(_("path '%s' does not have necessary versions"), path);


read_mmblob(&ancestor, threeway[0].hash); read_mmblob(&ancestor, &threeway[0]);
read_mmblob(&ours, threeway[1].hash); read_mmblob(&ours, &threeway[1]);
read_mmblob(&theirs, threeway[2].hash); read_mmblob(&theirs, &threeway[2]);


/* /*
* NEEDSWORK: re-create conflicts from merges with * NEEDSWORK: re-create conflicts from merges with

6
merge-recursive.c
View File

@ -910,9 +910,9 @@ static int merge_3way(struct merge_options *o,
name2 = mkpathdup("%s", branch2); name2 = mkpathdup("%s", branch2);
} }


read_mmblob(&orig, one->oid.hash); read_mmblob(&orig, &one->oid);
read_mmblob(&src1, a->oid.hash); read_mmblob(&src1, &a->oid);
read_mmblob(&src2, b->oid.hash); read_mmblob(&src2, &b->oid);


merge_status = ll_merge(result_buf, a->path, &orig, base_name, merge_status = ll_merge(result_buf, a->path, &orig, base_name,
&src1, name1, &src2, name2, &ll_opts); &src1, name1, &src2, name2, &ll_opts);

6
notes-merge.c
View File

@ -344,9 +344,9 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
mmfile_t base, local, remote; mmfile_t base, local, remote;
int status; int status;


read_mmblob(&base, p->base.hash); read_mmblob(&base, &p->base);
read_mmblob(&local, p->local.hash); read_mmblob(&local, &p->local);
read_mmblob(&remote, p->remote.hash); read_mmblob(&remote, &p->remote);


status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL, status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
&local, o->local_ref, &remote, o->remote_ref, NULL); &local, o->local_ref, &remote, o->remote_ref, NULL);

8
xdiff-interface.c
View File

@ -178,20 +178,20 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
return 0; return 0;
} }


void read_mmblob(mmfile_t *ptr, const unsigned char *sha1) void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
{ {
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;


if (!hashcmp(sha1, null_sha1)) { if (!oidcmp(oid, &null_oid)) {
ptr->ptr = xstrdup(""); ptr->ptr = xstrdup("");
ptr->size = 0; ptr->size = 0;
return; return;
} }


ptr->ptr = read_sha1_file(sha1, &type, &size); ptr->ptr = read_sha1_file(oid->hash, &type, &size);
if (!ptr->ptr || type != OBJ_BLOB) if (!ptr->ptr || type != OBJ_BLOB)
die("unable to read blob object %s", sha1_to_hex(sha1)); die("unable to read blob object %s", oid_to_hex(oid));
ptr->size = size; ptr->size = size;
} }



3
xdiff-interface.h
View File

@ -1,6 +1,7 @@
#ifndef XDIFF_INTERFACE_H #ifndef XDIFF_INTERFACE_H
#define XDIFF_INTERFACE_H #define XDIFF_INTERFACE_H


#include "cache.h"
#include "xdiff/xdiff.h" #include "xdiff/xdiff.h"


/* /*
@ -20,7 +21,7 @@ int parse_hunk_header(char *line, int len,
int *ob, int *on, int *ob, int *on,
int *nb, int *nn); int *nb, int *nn);
int read_mmfile(mmfile_t *ptr, const char *filename); 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); int buffer_is_binary(const char *ptr, unsigned long size);


extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);