openstack/deb-python-pygit2
Code Issues Proposed changes

Merge remote-tracking branch 'cjwatson/merge-index-path-refs'

Browse Source
This commit is contained in:
J. David Ibáñez 2015-05-03 11:33:28 +02:00
commit 8a196f656b
1 changed files with 6 additions and 3 deletions

9
pygit2/repository.py

@ -540,9 +540,12 @@ class Repository(_Repository):
"""
cmergeresult = ffi.new('git_merge_file_result *')
cancestor = ancestor._to_c()[0] if ancestor is not None else ffi.NULL
cours = ours._to_c()[0] if ours is not None else ffi.NULL
ctheirs = theirs._to_c()[0] if theirs is not None else ffi.NULL
cancestor, ancestor_str_ref = (
ancestor._to_c() if ancestor is not None else (ffi.NULL, ffi.NULL))
cours, ours_str_ref = (
ours._to_c() if ours is not None else (ffi.NULL, ffi.NULL))
ctheirs, theirs_str_ref = (
theirs._to_c() if theirs is not None else (ffi.NULL, ffi.NULL))
err = C.git_merge_file_from_index(
cmergeresult, self._repo,