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

repository: factor out worktree check

Browse Source 
The check whether a repository is a worktree or not is currently done
inside of `git_repository_open_ext`. As we want to extend this function
later on, pull it out into its own function `repo_is_worktree` to ease
working on it.
This commit is contained in:
Patrick Steinhardt 2017-05-19 08:59:46 +02:00
parent 32841973f1
commit 9f9fd05f1c
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/repository.c
View File

@ -758,6 +758,22 @@ success:
return error; return error;
} }
static int repo_is_worktree(unsigned *out, const git_repository *repo)
{
git_buf gitdir_link = GIT_BUF_INIT;
int error;
if ((error = git_buf_joinpath(&gitdir_link, repo->gitdir, "gitdir")) < 0)
return -1;
/* A 'gitdir' file inside a git directory is currently
* only used when the repository is a working tree. */
*out = !!git_path_exists(gitdir_link.ptr);
git_buf_free(&gitdir_link);
return error;
}
int git_repository_open_ext( int git_repository_open_ext(
git_repository **repo_ptr, git_repository **repo_ptr,
const char *start_path, const char *start_path,
@ -765,6 +781,7 @@ int git_repository_open_ext(
const char *ceiling_dirs) const char *ceiling_dirs)
{ {
int error; int error;
unsigned is_worktree;
git_buf gitdir = GIT_BUF_INIT, workdir = GIT_BUF_INIT, git_buf gitdir = GIT_BUF_INIT, workdir = GIT_BUF_INIT,
gitlink = GIT_BUF_INIT, commondir = GIT_BUF_INIT; gitlink = GIT_BUF_INIT, commondir = GIT_BUF_INIT;
git_repository *repo; git_repository *repo;
@ -797,12 +814,9 @@ int git_repository_open_ext(
GITERR_CHECK_ALLOC(repo->commondir); GITERR_CHECK_ALLOC(repo->commondir);
} }
if ((error = git_buf_joinpath(&gitdir, repo->gitdir, "gitdir")) < 0) if ((error = repo_is_worktree(&is_worktree, repo)) < 0)
goto cleanup; goto cleanup;
/* A 'gitdir' file inside a git directory is currently repo->is_worktree = is_worktree;
* only used when the repository is a working tree. */
if (git_path_exists(gitdir.ptr))
repo->is_worktree = 1;
/* /*
* We'd like to have the config, but git doesn't particularly * We'd like to have the config, but git doesn't particularly