Merge branch 'bc/maint-apply-check-no-patch' into maint

[git.git] / submodule.c

diff --git a/submodule.c b/submodule.c
index 0fd10a0fdbf5d1af10819dea808b43f6b13b98a8..52cdcc6a6347a786deafad34efdb9dc4dc3670ff 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -391,7 +391,7 @@ static void commit_need_pushing(struct commit *commit, struct commit_list *paren
        rev.diffopt.format_callback_data = needs_pushing;
        diff_tree_combined(commit->object.sha1, parents, n, 1, &rev);
 
-       free(parents);
+       free((void *)parents);
 }
 
 int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name)