undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: convert merge_recursive_generic() to object_id

Browse Source 
Convert this function and the git merge-recursive subcommand to use
struct object_id.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2016-06-24 23:09:28 +00:00 committed by Junio C Hamano
parent b4da9d62f9
commit 4e8161a82e
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin/merge-recursive.c
View File

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

14
merge-recursive.c
View File

@ -1982,11 +1982,11 @@ int merge_recursive(struct merge_options *o,
return clean; return clean;
} }
static struct commit *get_ref(const unsigned char *sha1, const char *name) static struct commit *get_ref(const struct object_id *oid, const char *name)
{ {
struct object *object; struct object *object;
object = deref_tag(parse_object(sha1), name, strlen(name)); object = deref_tag(parse_object(oid->hash), name, strlen(name));
if (!object) if (!object)
return NULL; return NULL;
if (object->type == OBJ_TREE) if (object->type == OBJ_TREE)
@ -1999,10 +1999,10 @@ static struct commit *get_ref(const unsigned char *sha1, const char *name)
} }
int merge_recursive_generic(struct merge_options *o, int merge_recursive_generic(struct merge_options *o,
const unsigned char *head, const struct object_id *head,
const unsigned char *merge, const struct object_id *merge,
int num_base_list, int num_base_list,
const unsigned char **base_list, const struct object_id **base_list,
struct commit **result) struct commit **result)
{ {
int clean; int clean;
@ -2015,9 +2015,9 @@ int merge_recursive_generic(struct merge_options *o,
int i; int i;
for (i = 0; i < num_base_list; ++i) { for (i = 0; i < num_base_list; ++i) {
struct commit *base; struct commit *base;
if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i])))) if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
return error(_("Could not parse object '%s'"), return error(_("Could not parse object '%s'"),
sha1_to_hex(base_list[i])); oid_to_hex(base_list[i]));
commit_list_insert(base, &ca); commit_list_insert(base, &ca);
} }
} }

6
merge-recursive.h
View File

@ -49,10 +49,10 @@ int merge_trees(struct merge_options *o,
* virtual commits and call merge_recursive() proper. * virtual commits and call merge_recursive() proper.
*/ */
int merge_recursive_generic(struct merge_options *o, int merge_recursive_generic(struct merge_options *o,
const unsigned char *head, const struct object_id *head,
const unsigned char *merge, const struct object_id *merge,
int num_ca, int num_ca,
const unsigned char **ca, const struct object_id **ca,
struct commit **result); struct commit **result);
void init_merge_options(struct merge_options *o); void init_merge_options(struct merge_options *o);