Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
8d22773f
Commit
8d22773f
authored
Nov 05, 2013
by
nulltoken
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Plug git_merge() related leaks
parent
453e6b3e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
src/merge.c
+1
-0
tests-clar/merge/workdir/setup.c
+2
-0
No files found.
src/merge.c
View file @
8d22773f
...
...
@@ -2451,6 +2451,7 @@ int git_merge(
on_error
:
git_repository_merge_cleanup
(
repo
);
git_index_free
(
index_new
);
git__free
(
result
);
done
:
...
...
tests-clar/merge/workdir/setup.c
View file @
8d22773f
...
...
@@ -1019,6 +1019,7 @@ void test_merge_workdir_setup__retained_after_success(void)
git_merge_head_free
(
our_head
);
git_merge_head_free
(
their_heads
[
0
]);
git_merge_result_free
(
result
);
}
void
test_merge_workdir_setup__removed_after_failure
(
void
)
...
...
@@ -1051,4 +1052,5 @@ void test_merge_workdir_setup__removed_after_failure(void)
git_merge_head_free
(
our_head
);
git_merge_head_free
(
their_heads
[
0
]);
git_merge_result_free
(
result
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment