summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:12:34 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:12:34 -0800
commite72c1dd3bd3b6b2255707136348628a99d3b74a5 (patch)
tree4d9e54df2b2bf28faccd14cc7b0882ccb066729c /submodule.c
parent7b1baed3fbcffbc496a3161c969ba188ac7c6a7d (diff)
parent83838d5c1b8ca2efee52184136776c3cf7d5df2f (diff)
downloadgit-e72c1dd3bd3b6b2255707136348628a99d3b74a5.tar.gz
Merge branch 'ab/clang-lints'
* ab/clang-lints: cast variable in call to free() in builtin/diff.c and submodule.c apply: get rid of useless x < 0 comparison on a size_t type
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c
index 0fd10a0fdb..52cdcc6a63 100644
--- 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)