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>

diff --git a/builtin/apply.c b/builtin/apply.c
index 76b16121785de75462ccb06bb68805479976a380..df2c95d3f6f225cc570247cab1c300adf8d2cb6a 100644 (file)
--- 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;
 
        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",
        status = ll_merge(&result, path,
                          &base_file, "base",
                          &our_file, "ours",

diff --git a/builtin/checkout.c b/builtin/checkout.c
index ec85af565a553365c7cf62c6b401912c7ad3ca52..13169221b16a54fb0de5da5c2a73d179e4330045 100644 (file)
--- 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);
 
        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
 
        /*
         * NEEDSWORK: re-create conflicts from merges with

diff --git a/merge-recursive.c b/merge-recursive.c
index e3db594da168a312134f9870606c04fa0995a3b9..3750d2534f5f2e9842375516eb75143a8e52d7fe 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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(&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);
 
        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 cb36b43ca7e56b61f3b87bbaf5c176d81efd1b6d..b3536284c4954be3f24f9c68e4d52c42ec29eed1 100644 (file)
--- 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;
 
        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);
 
        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 f34ea762e477d9874ef8d75e24f54230520a6e4b..3bfc69cade6e543f69164ed6d989473de40b7b3c 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -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;
        enum object_type type;
 
 {
        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 = 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)
        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;
 }
 

diff --git a/xdiff-interface.h b/xdiff-interface.h
index fbb5a1c3949b6ef6ba0dfb758723a48f3b402190..6f6ba9095df1f81c975652ce515c451649974145 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -1,6 +1,7 @@
 #ifndef XDIFF_INTERFACE_H
 #define XDIFF_INTERFACE_H
 
 #ifndef 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 *nb, int *nn);
 int read_mmfile(mmfile_t *ptr, const char *filename);
                      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);
 int buffer_is_binary(const char *ptr, unsigned long size);
 
 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);