Merge pull request #62 from GarysMods2014/fixDiffMerge

chobie · chobie · commit 1c64293f5c05 · 2014-02-22T12:44:26.000+09:00
Fix for php_git2_git_diff_delta_to_array
diff --git a/diff.c b/diff.c
@@ -288,7 +288,7 @@ PHP_FUNCTION(git_diff_get_delta)
 
 	ZEND_FETCH_RESOURCE(_diff, php_git2_t*, &diff, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);
 	result = git_diff_get_delta(PHP_GIT2_V(_diff, diff), idx);
-	php_git2_git_diff_delta_to_array(result, &_result TSRMLS_CC);
+	php_git2_diff_delta_to_array(result, &_result TSRMLS_CC);
 	RETURN_ZVAL(_result, 0, 1);
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ PHP_FUNCTION(git_diff_get_delta)`
`288`	`288`
`289`	`289`	`ZEND_FETCH_RESOURCE(_diff, php_git2_t*, &diff, -1, PHP_GIT2_RESOURCE_NAME, git2_resource_handle);`
`290`	`290`	`result = git_diff_get_delta(PHP_GIT2_V(_diff, diff), idx);`
`291`		`- php_git2_git_diff_delta_to_array(result, &_result TSRMLS_CC);`
	`291`	`+ php_git2_diff_delta_to_array(result, &_result TSRMLS_CC);`
`292`	`292`	`RETURN_ZVAL(_result, 0, 1);`
`293`	`293`	`}`
`294`	`294`	`/* }}} */`