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

repository: get worktree HEAD via git_reference__read_head

Browse Source 
The functions `git_repository_head_for_worktree` and
`git_repository_detached_head_for_worktree` both implement their
own logic to read the HEAD reference file. Use the new function
`git_reference__read_head` instead to unify the code paths.
This commit is contained in:
Patrick Steinhardt 2017-04-05 13:47:09 +02:00
parent 987f565917
commit 3e84aa506d
1 changed files with 23 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/repository.c
View File

@ -2069,38 +2069,21 @@ static int get_worktree_file_path(git_buf *out, git_repository *repo, const char
return git_buf_printf(out, "%s/worktrees/%s/%s", repo->commondir, worktree, file);
}
static int read_worktree_head(git_buf *out, git_repository *repo, const char *name)
{
git_buf path = GIT_BUF_INIT;
int err;
assert(out && repo && name);
if ((err = get_worktree_file_path(&path, repo, name, "HEAD")) < 0 ||
(err = git_futils_readbuffer(out, path.ptr)) < 0)
goto out;
git_buf_rtrim(out);
out:
git_buf_free(&path);
return err;
}
int git_repository_head_detached_for_worktree(git_repository *repo, const char *name)
{
git_buf buf = GIT_BUF_INIT;
int ret;
git_reference *ref = NULL;
int error;
assert(repo && name);
if (read_worktree_head(&buf, repo, name) < 0)
return -1;
if ((error = git_repository_head_for_worktree(&ref, repo, name)) < 0)
goto out;
ret = git__strncmp(buf.ptr, GIT_SYMREF, strlen(GIT_SYMREF)) != 0;
git_buf_free(&buf);
error = (git_reference_type(ref) != GIT_REF_SYMBOLIC);
out:
git_reference_free(ref);
return ret;
return error;
}
int git_repository_head(git_reference **head_out, git_repository *repo)
@ -2124,44 +2107,34 @@ int git_repository_head(git_reference **head_out, git_repository *repo)
int git_repository_head_for_worktree(git_reference **out, git_repository *repo, const char *name)
{
git_buf buf = GIT_BUF_INIT;
git_reference *head;
int err;
git_buf path = GIT_BUF_INIT;
git_reference *head = NULL;
int error;
assert(out && repo && name);
*out = NULL;
if (git_repository_head_detached_for_worktree(repo, name))
return -1;
if ((err = read_worktree_head(&buf, repo, name)) < 0)
if ((error = get_worktree_file_path(&path, repo, name, GIT_HEAD_FILE)) < 0 ||
(error = git_reference__read_head(&head, repo, path.ptr)) < 0)
goto out;
/* We can only resolve symbolic references */
if (git__strncmp(buf.ptr, GIT_SYMREF, strlen(GIT_SYMREF)))
{
err = -1;
goto out;
}
git_buf_consume(&buf, buf.ptr + strlen(GIT_SYMREF));
if (git_reference_type(head) != GIT_REF_OID) {
git_reference *resolved;
if ((err = git_reference_lookup(&head, repo, buf.ptr)) < 0)
goto out;
if (git_reference_type(head) == GIT_REF_OID)
{
*out = head;
err = 0;
goto out;
error = git_reference_lookup_resolved(&resolved, repo, git_reference_symbolic_target(head), -1);
git_reference_free(head);
head = resolved;
}
err = git_reference_lookup_resolved(
out, repo, git_reference_symbolic_target(head), -1);
git_reference_free(head);
*out = head;
out:
git_buf_free(&buf);
if (error)
git_reference_free(head);
git_buf_clear(&path);
return err;
return error;
}
int git_repository_head_unborn(git_repository *repo)