forced checkout sample

Author: MagicalTux

git2_php_util.c

@@ -8,8 +8,8 @@
 }
 
 #define ARRAY_FETCH_BOOL(_x) if ((data = zend_hash_str_find(ht, ZEND_STRL(#_x))) != NULL) { \
-	convert_to_bool(data); \
-	opts->_x = Z_BVAL_P(data); \
+	convert_to_boolean(data); \
+	opts->_x = Z_LVAL_P(data); \
 }
 
 #define ARRAY_FETCH_STRING(_x) if ((data = zend_hash_str_find(ht, ZEND_STRL(#_x))) != NULL) { \

git2_repository.c

@@ -262,7 +262,7 @@ static PHP_METHOD(Repository, checkout_head) {
 	HashTable *opts = NULL;
 	git_checkout_options opts_libgit2 = GIT_CHECKOUT_OPTIONS_INIT;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|H", &opts) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|h!", &opts) == FAILURE) {
 		RETURN_FALSE;
 	}
 

git2_tests/003_forced_checkout.php

@@ -0,0 +1,34 @@
+<?php
+
+$tmp = sys_get_temp_dir().'/php-git2_test_ssh2';
+
+$repo = Git2\Repository::init($tmp, false);
+
+try {
+	$remote = Git2\Remote::lookup_name($repo, 'origin');
+} catch(\Exception $e) {
+	$remote = Git2\Remote::create_with_fetchspec($repo, 'origin', 'git@github.com:MagicalTux/php-git2.git', '+refs/*:refs/*');
+}
+
+$fetch_opts = [
+	'callbacks' => [
+		'credentials' => function($url, $username, $types) {
+			return Git2\Cred::create_ssh_key($username, __DIR__.'/test_key.pub', __DIR__.'/test_key');
+		},
+	],
+	'update_fetchhead' => false,
+	'download_tags' => Git2\Remote::DOWNLOAD_TAGS_ALL,
+];
+
+echo "Fetching repository...\n";
+var_dump($remote->fetch(NULL, $fetch_opts));
+
+$cfg = $repo->config();
+$cfg->set_string('branch.master.remote', 'origin');
+$cfg->set_string('branch.master.merge', 'refs/heads/master');
+
+$repo->set_head('refs/heads/master');
+
+echo "Checking out...\n";
+var_dump($repo->checkout_head(['checkout_strategy' => \Git2::CHECKOUT_FORCE]));
+

php_git2.c

@@ -65,6 +65,30 @@ PHP_MINIT_FUNCTION(git2) {
 	GIT2_BASE_CONST(CERT_HOSTKEY_LIBSSH2);
 	GIT2_BASE_CONST(CERT_STRARRAY);
 
+	// checkout
+	GIT2_BASE_CONST(CHECKOUT_NONE);
+	GIT2_BASE_CONST(CHECKOUT_SAFE);
+	GIT2_BASE_CONST(CHECKOUT_FORCE);
+	GIT2_BASE_CONST(CHECKOUT_RECREATE_MISSING);
+	GIT2_BASE_CONST(CHECKOUT_ALLOW_CONFLICTS);
+	GIT2_BASE_CONST(CHECKOUT_REMOVE_UNTRACKED);
+	GIT2_BASE_CONST(CHECKOUT_REMOVE_IGNORED);
+	GIT2_BASE_CONST(CHECKOUT_UPDATE_ONLY);
+	GIT2_BASE_CONST(CHECKOUT_DONT_UPDATE_INDEX);
+	GIT2_BASE_CONST(CHECKOUT_NO_REFRESH);
+	GIT2_BASE_CONST(CHECKOUT_SKIP_UNMERGED);
+	GIT2_BASE_CONST(CHECKOUT_USE_OURS);
+	GIT2_BASE_CONST(CHECKOUT_USE_THEIRS);
+	GIT2_BASE_CONST(CHECKOUT_DISABLE_PATHSPEC_MATCH);
+	GIT2_BASE_CONST(CHECKOUT_SKIP_LOCKED_DIRECTORIES);
+	GIT2_BASE_CONST(CHECKOUT_DONT_OVERWRITE_IGNORED);
+	GIT2_BASE_CONST(CHECKOUT_CONFLICT_STYLE_MERGE);
+	GIT2_BASE_CONST(CHECKOUT_CONFLICT_STYLE_DIFF3);
+	GIT2_BASE_CONST(CHECKOUT_DONT_REMOVE_EXISTING);
+	GIT2_BASE_CONST(CHECKOUT_DONT_WRITE_INDEX);
+	GIT2_BASE_CONST(CHECKOUT_UPDATE_SUBMODULES);
+	GIT2_BASE_CONST(CHECKOUT_UPDATE_SUBMODULES_IF_CHANGED);
+
 	git2_exception_init(TSRMLS_C);
 	git2_repository_init(TSRMLS_C);
 	git2_config_init(TSRMLS_C);