summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-09-05 20:08:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-07 19:59:42 (GMT)
commitd449347d080cd97a9d6dc029014383d4817e34bf (patch)
treed64c39be3f1cd8f5833ac1a9dde0664de686a0bf
parente910bb1e79d53d43d07013b4d7e58c9f3ec53c8d (diff)
downloadgit-d449347d080cd97a9d6dc029014383d4817e34bf.zip
git-d449347d080cd97a9d6dc029014383d4817e34bf.tar.gz
git-d449347d080cd97a9d6dc029014383d4817e34bf.tar.bz2
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>
-rw-r--r--builtin/apply.c6
-rw-r--r--builtin/checkout.c6
-rw-r--r--merge-recursive.c6
-rw-r--r--notes-merge.c6
-rw-r--r--xdiff-interface.c8
-rw-r--r--xdiff-interface.h3
6 files changed, 18 insertions, 17 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 76b1612..df2c95d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3435,9 +3435,9 @@ static int three_way_merge(struct image *image,
mmbuffer_t result = { NULL };
int status;
- read_mmblob(&base_file, base->hash);
- read_mmblob(&our_file, ours->hash);
- read_mmblob(&their_file, theirs->hash);
+ read_mmblob(&base_file, base);
+ read_mmblob(&our_file, ours);
+ read_mmblob(&their_file, theirs);
status = ll_merge(&result, path,
&base_file, "base",
&our_file, "ours",
diff --git a/builtin/checkout.c b/builtin/checkout.c
index ec85af5..1316922 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -195,9 +195,9 @@ static int checkout_merged(int pos, struct checkout *state)
if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2]))
return error(_("path '%s' does not have necessary versions"), path);
- read_mmblob(&ancestor, threeway[0].hash);
- read_mmblob(&ours, threeway[1].hash);
- read_mmblob(&theirs, threeway[2].hash);
+ read_mmblob(&ancestor, &threeway[0]);
+ read_mmblob(&ours, &threeway[1]);
+ read_mmblob(&theirs, &threeway[2]);
/*
* NEEDSWORK: re-create conflicts from merges with
diff --git a/merge-recursive.c b/merge-recursive.c
index e3db594..3750d25 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -910,9 +910,9 @@ static int merge_3way(struct merge_options *o,
name2 = mkpathdup("%s", branch2);
}
- read_mmblob(&orig, one->oid.hash);
- read_mmblob(&src1, a->oid.hash);
- read_mmblob(&src2, b->oid.hash);
+ read_mmblob(&orig, &one->oid);
+ read_mmblob(&src1, &a->oid);
+ read_mmblob(&src2, &b->oid);
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
&src1, name1, &src2, name2, &ll_opts);
diff --git a/notes-merge.c b/notes-merge.c
index cb36b43..b353628 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -344,9 +344,9 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
mmfile_t base, local, remote;
int status;
- read_mmblob(&base, p->base.hash);
- read_mmblob(&local, p->local.hash);
- read_mmblob(&remote, p->remote.hash);
+ read_mmblob(&base, &p->base);
+ read_mmblob(&local, &p->local);
+ read_mmblob(&remote, &p->remote);
status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
&local, o->local_ref, &remote, o->remote_ref, NULL);
diff --git a/xdiff-interface.c b/xdiff-interface.c
index f34ea76..3bfc69c 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -178,20 +178,20 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
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;
enum object_type type;
- if (!hashcmp(sha1, null_sha1)) {
+ if (!oidcmp(oid, &null_oid)) {
ptr->ptr = xstrdup("");
ptr->size = 0;
return;
}
- ptr->ptr = read_sha1_file(sha1, &type, &size);
+ ptr->ptr = read_sha1_file(oid->hash, &type, &size);
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;
}
diff --git a/xdiff-interface.h b/xdiff-interface.h
index fbb5a1c..6f6ba90 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);