Commit 0f642f31 by Patrick Steinhardt

refs: properly report errors from `update_wt_heads`

parent 0c28c72d
...@@ -622,15 +622,25 @@ typedef struct { ...@@ -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 ((error = git_reference__read_head(&head, repo, path)) < 0) {
giterr_set(GITERR_REFERENCE, "could not read HEAD when renaming references");
goto out;
}
if (git_reference__read_head(&head, repo, path) < 0 || if ((gitdir = git_path_dirname(path)) == NULL) {
git_reference_type(head) != GIT_REF_SYMBOLIC || error = -1;
git__strcmp(head->target.symbolic, data->old_name) != 0 ||
(gitdir = git_path_dirname(path)) == NULL)
goto out; 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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment