checkout: introduce git_checkout_opts

Refactor checkout into several more-sensible
entry points, which consolidates common options
into a single structure that may be passed around.

1 files changed, 14 insertions, 11 deletions

diff --git a/src/clone.c b/src/clone.c
index 803338ebb..7ce391136 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -161,20 +161,20 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
 
 static int setup_remotes_and_fetch(git_repository *repo,
 											  const char *origin_url,
-											  git_indexer_stats *stats)
+											  git_indexer_stats *fetch_stats)
 {
 	int retcode = GIT_ERROR;
 	git_remote *origin = NULL;
 	git_off_t bytes = 0;
 	git_indexer_stats dummy_stats;
 
-	if (!stats) stats = &dummy_stats;
+	if (!fetch_stats) fetch_stats = &dummy_stats;
 
 	/* Create the "origin" remote */
 	if (!git_remote_add(&origin, repo, "origin", origin_url)) {
 		/* Connect and download everything */
 		if (!git_remote_connect(origin, GIT_DIR_FETCH)) {
-			if (!git_remote_download(origin, &bytes, stats)) {
+			if (!git_remote_download(origin, &bytes, fetch_stats)) {
 				/* Create "origin/foo" branches for all remote branches */
 				if (!git_remote_update_tips(origin, NULL)) {
 					/* Point HEAD to the same ref as the remote's head */
@@ -209,18 +209,21 @@ static bool path_is_okay(const char *path)
 static int clone_internal(git_repository **out,
 								  const char *origin_url,
 								  const char *path,
-								  git_indexer_stats *stats,
+								  git_indexer_stats *fetch_stats,
 								  int is_bare)
 {
 	int retcode = GIT_ERROR;
 	git_repository *repo = NULL;
+	git_indexer_stats dummy_stats;
+
+	if (!fetch_stats) fetch_stats = &dummy_stats;
 
 	if (!path_is_okay(path)) {
 		return GIT_ERROR;
 	}
 
 	if (!(retcode = git_repository_init(&repo, path, is_bare))) {
-		if ((retcode = setup_remotes_and_fetch(repo, origin_url, stats)) < 0) {
+		if ((retcode = setup_remotes_and_fetch(repo, origin_url, fetch_stats)) < 0) {
 			/* Failed to fetch; clean up */
 			git_repository_free(repo);
 			git_futils_rmdir_r(path, GIT_DIRREMOVAL_FILES_AND_DIRS);
@@ -236,25 +239,25 @@ static int clone_internal(git_repository **out,
 int git_clone_bare(git_repository **out,
 						 const char *origin_url,
 						 const char *dest_path,
-						 git_indexer_stats *stats)
+						 git_indexer_stats *fetch_stats)
 {
 	assert(out && origin_url && dest_path);
-	return clone_internal(out, origin_url, dest_path, stats, 1);
+	return clone_internal(out, origin_url, dest_path, fetch_stats, 1);
 }
 
 
 int git_clone(git_repository **out,
 				  const char *origin_url,
 				  const char *workdir_path,
-				  git_indexer_stats *stats)
+				  git_indexer_stats *fetch_stats,
+				  git_checkout_opts *checkout_opts)
 {
 	int retcode = GIT_ERROR;
 
 	assert(out && origin_url && workdir_path);
 
-	if (!(retcode = clone_internal(out, origin_url, workdir_path, stats, 0))) {
-		git_indexer_stats checkout_stats;
-		retcode = git_checkout_force(*out, &checkout_stats);
+	if (!(retcode = clone_internal(out, origin_url, workdir_path, fetch_stats, 0))) {
+		retcode = git_checkout_head(*out, checkout_opts);
 	}
 
 	return retcode;