builtin/merge: switch tree functions to use object_id

The read_empty and reset_hard functions are static and their callers
have already changed to use struct object_id, so convert them as well.
To avoid dependency on the hash algorithm in use, switch from using
EMPTY_TREE_SHA1_HEX to using empty_tree_oid_hex.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 9db5a2cf16e189bb3bd0ceec7d34c6651d630225..7084bcfdeaa502f4098aac948db8ffc0d941b5ef 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -280,7 +280,7 @@ static int save_state(struct object_id *stash)
        return rc;
 }
 
        return rc;
 }
 

-static void read_empty(unsigned const char *sha1, int verbose)
+static void read_empty(const struct object_id *oid, int verbose)

 {
        int i = 0;
        const char *args[7];
 {
        int i = 0;
        const char *args[7];


@@ -290,15 +290,15 @@ static void read_empty(unsigned const char *sha1, int verbose)
                args[i++] = "-v";
        args[i++] = "-m";
        args[i++] = "-u";
                args[i++] = "-v";
        args[i++] = "-m";
        args[i++] = "-u";

-       args[i++] = EMPTY_TREE_SHA1_HEX;
-       args[i++] = sha1_to_hex(sha1);
+       args[i++] = empty_tree_oid_hex();
+       args[i++] = oid_to_hex(oid);

        args[i] = NULL;
 
        if (run_command_v_opt(args, RUN_GIT_CMD))
                die(_("read-tree failed"));
 }
 
        args[i] = NULL;
 
        if (run_command_v_opt(args, RUN_GIT_CMD))
                die(_("read-tree failed"));
 }
 

-static void reset_hard(unsigned const char *sha1, int verbose)
+static void reset_hard(const struct object_id *oid, int verbose)

 {
        int i = 0;
        const char *args[6];
 {
        int i = 0;
        const char *args[6];


@@ -308,7 +308,7 @@ static void reset_hard(unsigned const char *sha1, int verbose)
                args[i++] = "-v";
        args[i++] = "--reset";
        args[i++] = "-u";
                args[i++] = "-v";
        args[i++] = "--reset";
        args[i++] = "-u";

-       args[i++] = sha1_to_hex(sha1);
+       args[i++] = oid_to_hex(oid);

        args[i] = NULL;
 
        if (run_command_v_opt(args, RUN_GIT_CMD))
        args[i] = NULL;
 
        if (run_command_v_opt(args, RUN_GIT_CMD))


@@ -324,7 +324,7 @@ static void restore_state(const struct object_id *head,
        if (is_null_oid(stash))
                return;
 
        if (is_null_oid(stash))
                return;
 

-       reset_hard(head->hash, 1);
+       reset_hard(head, 1);

 
        args[2] = oid_to_hex(stash);
 
 
        args[2] = oid_to_hex(stash);
 


@@ -1297,7 +1297,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
                if (remoteheads->next)
                        die(_("Can merge only exactly one commit into empty head"));
                remote_head_oid = &remoteheads->item->object.oid;
                if (remoteheads->next)
                        die(_("Can merge only exactly one commit into empty head"));
                remote_head_oid = &remoteheads->item->object.oid;

-               read_empty(remote_head_oid->hash, 0);
+               read_empty(remote_head_oid, 0);

                update_ref("initial pull", "HEAD", remote_head_oid, NULL, 0,
                           UPDATE_REFS_DIE_ON_ERR);
                goto done;
                update_ref("initial pull", "HEAD", remote_head_oid, NULL, 0,
                           UPDATE_REFS_DIE_ON_ERR);
                goto done;