Merge pull request libgit2#3907 from steffhip/git_checkout_tree-fix

pks-t · pks-t · commit a08e88259fe7 · 2016-08-30T08:22:49.000+02:00
diff --git a/src/checkout.c b/src/checkout.c
@@ -2722,7 +2722,7 @@ int git_checkout_tree(
 	if ((error = git_repository_index(&index, repo)) < 0)
 		return error;
 
-	if ((opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) {
+	if (opts && (opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) {
 		iter_opts.pathlist.count = opts->paths.count;
 		iter_opts.pathlist.strings = opts->paths.strings;
 	}
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c
@@ -1479,3 +1479,7 @@ void test_checkout_tree__baseline_is_empty_when_no_index(void)
 	git_reference_free(head);
 }
 
+void test_checkout_tree__nullopts(void)
+{
+	cl_git_pass(git_checkout_tree(g_repo, NULL, NULL));
+}

Original file line number	Diff line number	Diff line change
`@@ -2722,7 +2722,7 @@ int git_checkout_tree(`
`2722`	`2722`	`if ((error = git_repository_index(&index, repo)) < 0)`
`2723`	`2723`	`return error;`
`2724`	`2724`
`2725`		`- if ((opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) {`
	`2725`	`+ if (opts && (opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) {`
`2726`	`2726`	`iter_opts.pathlist.count = opts->paths.count;`
`2727`	`2727`	`iter_opts.pathlist.strings = opts->paths.strings;`
`2728`	`2728`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1479,3 +1479,7 @@ void test_checkout_tree__baseline_is_empty_when_no_index(void)`
`1479`	`1479`	`git_reference_free(head);`
`1480`	`1480`	`}`
`1481`	`1481`
	`1482`	`+void test_checkout_tree__nullopts(void)`
	`1483`	`+{`
	`1484`	`+ cl_git_pass(git_checkout_tree(g_repo, NULL, NULL));`
	`1485`	`+}`