diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:47:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:47:51 -0800 |
| commit | c0eb9ccfb97297e25ccbab0481159282147b353f (patch) | |
| tree | b7484bd897f92f726103dc3363183bca9626358e /submodule.c | |
| parent | 3b425656a469722d9c45b7c88e0e01a9cd8c0fd3 (diff) | |
| parent | 83838d5c1b8ca2efee52184136776c3cf7d5df2f (diff) | |
| download | git-c0eb9ccfb97297e25ccbab0481159282147b353f.tar.gz git-c0eb9ccfb97297e25ccbab0481159282147b353f.tar.xz | |
Merge branch 'ab/clang-lints' into maint-1.7.7
* 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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 0b709bc29..09a41b59b 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) |