diff options
Diffstat (limited to 'src/refs.c')
| -rw-r--r-- | src/refs.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/refs.c b/src/refs.c index bd6fbee0e..9dc422e1b 100644 --- a/src/refs.c +++ b/src/refs.c @@ -15,6 +15,7 @@ #include <git2/tag.h> #include <git2/object.h> #include <git2/oid.h> +#include <git2/branch.h> GIT__USE_STRMAP; @@ -1343,9 +1344,7 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force) unsigned int normalization_flags; git_buf aux_path = GIT_BUF_INIT; char normalized[GIT_REFNAME_MAX]; - - const char *head_target = NULL; - git_reference *head = NULL; + bool should_head_be_updated = false; normalization_flags = ref->flags & GIT_REF_SYMBOLIC ? GIT_REF_FORMAT_ALLOW_ONELEVEL @@ -1367,6 +1366,12 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force) return -1; /* + * Check if we have to update HEAD. + */ + if ((should_head_be_updated = git_branch_is_head(ref)) < 0) + goto cleanup; + + /* * Now delete the old ref and remove an possibly existing directory * named `new_name`. Note that using the internal `reference_delete` * method deletes the ref from disk but doesn't free the pointer, so @@ -1390,25 +1395,13 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force) goto rollback; /* - * Check if we have to update HEAD. + * Update HEAD it was poiting to the reference being renamed. */ - if (git_reference_lookup(&head, ref->owner, GIT_HEAD_FILE) < 0) { - giterr_set(GITERR_REFERENCE, - "Failed to update HEAD after renaming reference"); - goto cleanup; - } - - head_target = git_reference_target(head); - - if (head_target && !strcmp(head_target, ref->name)) { - git_reference_free(head); - head = NULL; - - if (git_reference_create_symbolic(&head, ref->owner, "HEAD", new_name, 1) < 0) { + if (should_head_be_updated && + git_repository_set_head(ref->owner, new_name) < 0) { giterr_set(GITERR_REFERENCE, "Failed to update HEAD after renaming reference"); goto cleanup; - } } /* @@ -1426,12 +1419,10 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force) /* The reference is no longer packed */ ref->flags &= ~GIT_REF_PACKED; - git_reference_free(head); git_buf_free(&aux_path); return 0; cleanup: - git_reference_free(head); git_buf_free(&aux_path); return -1; |