proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-19 20:36:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refs: properly report errors from update_wt_heads

Browse Source
This commit is contained in:
Patrick Steinhardt 2017-06-06 14:54:19 +02:00
parent 0c28c72d13
commit 0f642f3168
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/refs.c
View File

@ -622,15 +622,25 @@ typedef struct {
static int update_wt_heads(git_repository *repo, const char *path, void *payload) static int update_wt_heads(git_repository *repo, const char *path, void *payload)
{ {
rename_cb_data *data = (rename_cb_data *) payload; rename_cb_data *data = (rename_cb_data *) payload;
git_reference *head; git_reference *head = NULL;
char *gitdir = NULL; char *gitdir = NULL;
int error = 0; int error;
if (git_reference__read_head(&head, repo, path) < 0 || if ((error = git_reference__read_head(&head, repo, path)) < 0) {
git_reference_type(head) != GIT_REF_SYMBOLIC || giterr_set(GITERR_REFERENCE, "could not read HEAD when renaming references");
git__strcmp(head->target.symbolic, data->old_name) != 0 ||
(gitdir = git_path_dirname(path)) == NULL)
goto out; goto out;
}
if ((gitdir = git_path_dirname(path)) == NULL) {
error = -1;
goto out;
}
if (git_reference_type(head) != GIT_REF_SYMBOLIC ||
git__strcmp(head->target.symbolic, data->old_name) != 0) {
error = 0;
goto out;
}
/* Update HEAD it was pointing to the reference being renamed */ /* Update HEAD it was pointing to the reference being renamed */
if ((error = git_repository_create_head(gitdir, data->new_name)) < 0) { if ((error = git_repository_create_head(gitdir, data->new_name)) < 0) {