proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 22:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2209 from ethomson/cleanup

Browse Source 
Cleanup some warnings and mem leaks
This commit is contained in:
Vicent Marti 2014-03-26 19:37:01 +01:00
commit f4afcaa0d5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/merge.c
View File

@ -2629,9 +2629,8 @@ int git_merge(
on_error: on_error:
merge_state_cleanup(repo); merge_state_cleanup(repo);
git_index_free(index_new);
done: done:
git_index_free(index_new);
git_index_free(index_repo); git_index_free(index_repo);
git_tree_free(ancestor_tree); git_tree_free(ancestor_tree);

9
tests/revwalk/hidecb.c
View File

@ -48,18 +48,27 @@ void test_revwalk_hidecb__cleanup(void)
/* Hide all commits */ /* Hide all commits */
static int hide_every_commit_cb(const git_oid *commit_id, void *data) static int hide_every_commit_cb(const git_oid *commit_id, void *data)
{ {
GIT_UNUSED(commit_id);
GIT_UNUSED(data);
return 1; return 1;
} }
/* Do not hide anything */ /* Do not hide anything */
static int hide_none_cb(const git_oid *commit_id, void *data) static int hide_none_cb(const git_oid *commit_id, void *data)
{ {
GIT_UNUSED(commit_id);
GIT_UNUSED(data);
return 0; return 0;
} }
/* Hide some commits */ /* Hide some commits */
static int hide_commit_cb(const git_oid *commit_id, void *data) static int hide_commit_cb(const git_oid *commit_id, void *data)
{ {
GIT_UNUSED(commit_id);
GIT_UNUSED(data);
if (0 == git_oid_cmp(commit_id, &commit_ids[5])) if (0 == git_oid_cmp(commit_id, &commit_ids[5]))
return 1; return 1;
else else