openstack/deb-python-pygit2
Code Issues Proposed changes

Make checkout to fail on unexpected options

Browse Source
This commit is contained in:
J. David Ibáñez
2014-07-19 12:22:34 +02:00
parent fdfda17121
commit 4c375907c5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pygit2/repository.py
View File

@@ -177,7 +177,7 @@ class Repository(_Repository):
# Checkout # Checkout
# #
@staticmethod @staticmethod
def _checkout_args_to_options(**kwargs): def _checkout_args_to_options(strategy=None, directory=None):
# Create the options struct to pass # Create the options struct to pass
copts = ffi.new('git_checkout_options *') copts = ffi.new('git_checkout_options *')
check_error(C.git_checkout_init_options(copts, 1)) check_error(C.git_checkout_init_options(copts, 1))
@@ -188,11 +188,9 @@ class Repository(_Repository):
# pygit2's default is SAFE_CREATE # pygit2's default is SAFE_CREATE
copts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE copts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE
# and go through the arguments to see what the user wanted # and go through the arguments to see what the user wanted
strategy = kwargs.get('strategy')
if strategy: if strategy:
copts.checkout_strategy = strategy copts.checkout_strategy = strategy
directory = kwargs.get('directory')
if directory: if directory:
target_dir = ffi.new('char[]', to_str(directory)) target_dir = ffi.new('char[]', to_str(directory))
refs.append(target_dir) refs.append(target_dir)