Merge branch 'sb/xdiff-remove-unused-static-decl' into maint

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 491efd556e87d0b263bb1029e0cabb9b7f6f1472..fd2c4556e1d648d82d3fb78675187623180c6261 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -9,10 +9,10 @@ static const char builtin_merge_recursive_usage[] =
 
 static const char *better_branch_name(const char *branch)
 {
-       static char githead_env[8 + 40 + 1];
+       static char githead_env[8 + GIT_SHA1_HEXSZ + 1];
        char *name;
 
-       if (strlen(branch) != 40)
+       if (strlen(branch) != GIT_SHA1_HEXSZ)
                return branch;
        xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch);
        name = getenv(githead_env);
@@ -21,10 +21,10 @@ static const char *better_branch_name(const char *branch)
 
 int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
 {
-       const unsigned char *bases[21];
+       const struct object_id *bases[21];
        unsigned bases_count = 0;
        int i, failed;
-       unsigned char h1[20], h2[20];
+       struct object_id h1, h2;
        struct merge_options o;
        struct commit *result;
 
@@ -46,10 +46,10 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                        continue;
                }
                if (bases_count < ARRAY_SIZE(bases)-1) {
-                       unsigned char *sha = xmalloc(20);
-                       if (get_sha1(argv[i], sha))
+                       struct object_id *oid = xmalloc(sizeof(struct object_id));
+                       if (get_oid(argv[i], oid))
                                die("Could not parse object '%s'", argv[i]);
-                       bases[bases_count++] = sha;
+                       bases[bases_count++] = oid;
                }
                else
                        warning("Cannot handle more than %d bases. "
@@ -62,9 +62,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
        o.branch1 = argv[++i];
        o.branch2 = argv[++i];
 
-       if (get_sha1(o.branch1, h1))
+       if (get_oid(o.branch1, &h1))
                die("Could not resolve ref '%s'", o.branch1);
-       if (get_sha1(o.branch2, h2))
+       if (get_oid(o.branch2, &h2))
                die("Could not resolve ref '%s'", o.branch2);
 
        o.branch1 = better_branch_name(o.branch1);
@@ -73,7 +73,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
        if (o.verbosity >= 3)
                printf("Merging %s with %s\n", o.branch1, o.branch2);
 
-       failed = merge_recursive_generic(&o, h1, h2, bases_count, bases, &result);
+       failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
        if (failed < 0)
                return 128; /* die() error code */
        return failed;