openstack/deb-python-pygit2
Code Issues Proposed changes

implementing merge - some fixes for the pull request: MergeRestul typedef, pep7 fixes and some error checks

Browse Source
This commit is contained in:
Victor Garcia
2013-12-09 12:45:51 +01:00
parent 6855a599e4
commit 3cd8fed386
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/repository.c
View File

@@ -613,9 +613,8 @@ Repository_merge(Repository *self, PyObject *py_oid)
err = git_merge(&merge_result, self->repo, err = git_merge(&merge_result, self->repo,
(const git_merge_head **)&oid_merge_head, 1, (const git_merge_head **)&oid_merge_head, 1,
&default_opts); &default_opts);
if (err < 0) if (err < 0) {
{ git_merge_head_free(oid_merge_head);
git_merge_result_free(merge_result);
goto error; goto error;
} }
@@ -627,7 +626,6 @@ Repository_merge(Repository *self, PyObject *py_oid)
return py_merge_result; return py_merge_result;
error: error:
git_merge_head_free(oid_merge_head);
return Error_set(err); return Error_set(err);
} }

9
src/types.h
View File

@@ -218,13 +218,6 @@ typedef struct {
} BlameHunk; } BlameHunk;
/* git_merge */ /* git_merge */
typedef struct { SIMPLE_TYPE(MergeResult, git_merge_result, result)
PyObject_HEAD
int is_uptodate;
int is_fastforward;
PyObject* fastforward_oid;
PyObject* status;
} MergeResult;
#endif #endif