diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:09:57 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:56 +0900 |
| commit | 71f35d5cbc0336ca5dca6b638c31d96611d301a7 (patch) | |
| tree | 3b707f9f55c7fe37d5a7e817ac532ea943ef64a8 /submodule.c | |
| parent | fast-import: convert to struct object_id (diff) | |
| download | tgif-71f35d5cbc0336ca5dca6b638c31d96611d301a7.tar.xz | |
submodule: convert merge_submodule to use struct object_id
This is a caller of lookup_commit_reference, which we will convert
later.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/submodule.c b/submodule.c index d3299e29c0..9bdd5f6055 100644 --- a/submodule.c +++ b/submodule.c @@ -1566,9 +1566,9 @@ static void print_commit(struct commit *commit) #define MERGE_WARNING(path, msg) \ warning("Failed to merge submodule %s (%s)", path, msg); -int merge_submodule(unsigned char result[20], const char *path, - const unsigned char base[20], const unsigned char a[20], - const unsigned char b[20], int search) +int merge_submodule(struct object_id *result, const char *path, + const struct object_id *base, const struct object_id *a, + const struct object_id *b, int search) { struct commit *commit_base, *commit_a, *commit_b; int parent_count; @@ -1577,14 +1577,14 @@ int merge_submodule(unsigned char result[20], const char *path, int i; /* store a in result in case we fail */ - hashcpy(result, a); + oidcpy(result, a); /* we can not handle deletion conflicts */ - if (is_null_sha1(base)) + if (is_null_oid(base)) return 0; - if (is_null_sha1(a)) + if (is_null_oid(a)) return 0; - if (is_null_sha1(b)) + if (is_null_oid(b)) return 0; if (add_submodule_odb(path)) { @@ -1592,9 +1592,9 @@ int merge_submodule(unsigned char result[20], const char *path, return 0; } - if (!(commit_base = lookup_commit_reference(base)) || - !(commit_a = lookup_commit_reference(a)) || - !(commit_b = lookup_commit_reference(b))) { + if (!(commit_base = lookup_commit_reference(base->hash)) || + !(commit_a = lookup_commit_reference(a->hash)) || + !(commit_b = lookup_commit_reference(b->hash))) { MERGE_WARNING(path, "commits not present"); return 0; } @@ -1608,11 +1608,11 @@ int merge_submodule(unsigned char result[20], const char *path, /* Case #1: a is contained in b or vice versa */ if (in_merge_bases(commit_a, commit_b)) { - hashcpy(result, b); + oidcpy(result, b); return 1; } if (in_merge_bases(commit_b, commit_a)) { - hashcpy(result, a); + oidcpy(result, a); return 1; } |