openstack/deb-python-pygit2
Code Issues Proposed changes

Modify Index.write_tree() to have more robust Repository detection

Browse Source 
Currently, Index.write_tree() relies on either the caller passing in a
`repo=` arg or the underlying `git_index` being already bound to a
`git_repository`. This ignores the case where the caller does not pass
a `repo` argument to `Index.write_tree()` but the `Index._repo`
property is populated on the index.

This change modifies Index.write_tree() to use the passed-in `repo`
argument, falls back to using `Index._repo` and then assumes that
`git_index` must be bound to a `git_repository`. This change should make
Index.write_tree() a little more robust in the most common use-case.
This commit is contained in:
Mark Adams
2017-06-05 16:02:01 -05:00
parent f18de427bf
commit 87beb76dcc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pygit2/index.py
View File

@@ -157,6 +157,9 @@ class Index(object):
It returns the id of the resulting tree. It returns the id of the resulting tree.
""" """
coid = ffi.new('git_oid *') coid = ffi.new('git_oid *')
repo = repo or self._repo
if repo: if repo:
err = C.git_index_write_tree_to(coid, self._index, repo._repo) err = C.git_index_write_tree_to(coid, self._index, repo._repo)
else: else: