diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-03-31 01:39:56 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-31 08:33:55 -0700 |
commit | 98a72ddc12e13231537150607f4a6a8ff8b43854 (patch) | |
tree | b519703af87417aa54f59f80f1a2d6d9ff7f7a8c /combine-diff.c | |
parent | ee3051bd2307cdc0145aa9ed9dcacb8acfc08c40 (diff) | |
download | git-98a72ddc12e13231537150607f4a6a8ff8b43854.tar.gz |
Make sha1_array_append take a struct object_id *
Convert the callers to pass struct object_id by changing the function
declaration and definition and applying the following semantic patch:
@@
expression E1, E2;
@@
- sha1_array_append(E1, E2.hash)
+ sha1_array_append(E1, &E2)
@@
expression E1, E2;
@@
- sha1_array_append(E1, E2->hash)
+ sha1_array_append(E1, E2)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
-rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index a5b86d7eb9..c92029484c 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1535,7 +1535,7 @@ void diff_tree_combined_merge(const struct commit *commit, int dense, struct sha1_array parents = SHA1_ARRAY_INIT; while (parent) { - sha1_array_append(&parents, parent->item->object.oid.hash); + sha1_array_append(&parents, &parent->item->object.oid); parent = parent->next; } diff_tree_combined(commit->object.oid.hash, &parents, dense, rev); |