diff options
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/submodule.c b/submodule.c index 68c1ba90b9..788d5327ac 100644 --- a/submodule.c +++ b/submodule.c @@ -373,15 +373,11 @@ static void collect_submodules_from_diff(struct diff_queue_struct *q, static void commit_need_pushing(struct commit *commit, struct commit_list *parent, int *needs_pushing) { - const unsigned char (*parents)[20]; - unsigned int i, n; + struct sha1_array parents = SHA1_ARRAY_INIT; struct rev_info rev; - n = commit_list_count(parent); - parents = xmalloc(n * sizeof(*parents)); - - for (i = 0; i < n; i++) { - hashcpy((unsigned char *)(parents + i), parent->item->object.sha1); + while (parent) { + sha1_array_append(&parents, parent->item->object.sha1); parent = parent->next; } @@ -389,9 +385,9 @@ static void commit_need_pushing(struct commit *commit, struct commit_list *paren rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; rev.diffopt.format_callback = collect_submodules_from_diff; rev.diffopt.format_callback_data = needs_pushing; - diff_tree_combined(commit->object.sha1, parents, n, 1, &rev); + diff_tree_combined(commit->object.sha1, &parents, 1, &rev); - free((void *)parents); + sha1_array_clear(&parents); } int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name) |