proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 13:12:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fix for cmn/clone-into-mirror.

Browse Source 
A recently added check might skip initialization of old_fetchhead and go
directly to cleanup. So, destruct in the opposite order of construction.
This commit is contained in:
Albert Meltzer 2014-05-19 09:13:45 -07:00
parent 430866d28c
commit 60cdf49583
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/clone.c
View File

@ -342,7 +342,7 @@ static bool should_checkout(
int git_clone_into(git_repository *repo, git_remote *_remote, const git_checkout_options *co_opts, const char *branch, const git_signature *signature) int git_clone_into(git_repository *repo, git_remote *_remote, const git_checkout_options *co_opts, const char *branch, const git_signature *signature)
{ {
int error = 0, old_fetchhead; int error;
git_buf reflog_message = GIT_BUF_INIT; git_buf reflog_message = GIT_BUF_INIT;
git_remote *remote; git_remote *remote;
const git_remote_callbacks *callbacks; const git_remote_callbacks *callbacks;
@ -359,13 +359,12 @@ int git_clone_into(git_repository *repo, git_remote *_remote, const git_checkout
callbacks = git_remote_get_callbacks(_remote); callbacks = git_remote_get_callbacks(_remote);
if (!giterr__check_version(callbacks, 1, "git_remote_callbacks") && if (!giterr__check_version(callbacks, 1, "git_remote_callbacks") &&
(error = git_remote_set_callbacks(remote, git_remote_get_callbacks(_remote))) < 0) (error = git_remote_set_callbacks(remote, callbacks)) < 0)
goto cleanup; goto cleanup;
if ((error = git_remote_add_fetch(remote, "refs/tags/*:refs/tags/*")) < 0) if ((error = git_remote_add_fetch(remote, "refs/tags/*:refs/tags/*")) < 0)
goto cleanup; goto cleanup;
old_fetchhead = git_remote_update_fetchhead(remote);
git_remote_set_update_fetchhead(remote, 0); git_remote_set_update_fetchhead(remote, 0);
git_buf_printf(&reflog_message, "clone: from %s", git_remote_url(remote)); git_buf_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
@ -383,7 +382,6 @@ int git_clone_into(git_repository *repo, git_remote *_remote, const git_checkout
error = git_checkout_head(repo, co_opts); error = git_checkout_head(repo, co_opts);
cleanup: cleanup:
git_remote_set_update_fetchhead(remote, old_fetchhead);
git_remote_free(remote); git_remote_free(remote);
git_buf_free(&reflog_message); git_buf_free(&reflog_message);