Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

clone: don't swallow error in should_checkout

Browse Source 
When determining whether to check out a branch, we did not actually look
at `should_checkout`'s possible error condition. Disconnect the boolean
"should checkout" value from the potential error code so that it no
longer looks like a function that can be treated as if it returns a
boolean.
This commit is contained in:
Edward Thomson
2024-02-04 14:40:47 +00:00
parent 9b2577f8e0
commit ca864c5914
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/libgit2/clone.c
View File

@@ -362,25 +362,29 @@ on_error:
return error;
}
static bool should_checkout(
static int should_checkout(
bool *out,
git_repository *repo,
bool is_bare,
const git_checkout_options *opts)
{
if (is_bare)
return false;
int error;
if (!opts)
return false;
if (!opts || is_bare || opts->checkout_strategy == GIT_CHECKOUT_NONE) {
*out = 0;
return 0;
}
if (opts->checkout_strategy == GIT_CHECKOUT_NONE)
return false;
if ((error = git_repository_head_unborn(repo)) < 0)
return error;
return !git_repository_head_unborn(repo);
*out = !error;
return 0;
}
static int checkout_branch(git_repository *repo, git_remote *remote, const git_checkout_options *co_opts, const char *branch, const char *reflog_message)
{
bool checkout;
int error;
if (branch)
@@ -389,7 +393,13 @@ static int checkout_branch(git_repository *repo, git_remote *remote, const git_c
else
error = update_head_to_remote(repo, remote, reflog_message);
if (!error && should_checkout(repo, git_repository_is_bare(repo), co_opts))
if (error < 0)
return error;
if ((error = should_checkout(&checkout, repo, git_repository_is_bare(repo), co_opts)) < 0)
return error;
if (checkout)
error = git_checkout_head(repo, co_opts);
return error;