proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-14 00:35:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

worktree: have is_worktree_dir accept a string instead of buffer

Browse Source 
This will be used in later commits, where it becomes cumbersome to
always pass in a buffer.
This commit is contained in:
Patrick Steinhardt 2017-03-15 13:42:52 +01:00
parent f3c3068670
commit 3e9c5d8a05
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/worktree.c
View File

@ -14,11 +14,20 @@
#include "repository.h" #include "repository.h"
#include "worktree.h" #include "worktree.h"
static bool is_worktree_dir(git_buf *dir) static bool is_worktree_dir(const char *dir)
{ {
return git_path_contains_file(dir, "commondir") git_buf buf = GIT_BUF_INIT;
&& git_path_contains_file(dir, "gitdir") int error;
&& git_path_contains_file(dir, "HEAD");
if (git_buf_sets(&buf, dir) < 0)
return -1;
error = git_path_contains_file(&buf, "commondir")
&& git_path_contains_file(&buf, "gitdir")
&& git_path_contains_file(&buf, "HEAD");
git_buf_free(&buf);
return error;
} }
int git_worktree_list(git_strarray *wts, git_repository *repo) int git_worktree_list(git_strarray *wts, git_repository *repo)
@ -47,7 +56,7 @@ int git_worktree_list(git_strarray *wts, git_repository *repo)
git_buf_truncate(&path, len); git_buf_truncate(&path, len);
git_buf_puts(&path, worktree); git_buf_puts(&path, worktree);
if (!is_worktree_dir(&path)) { if (!is_worktree_dir(path.ptr)) {
git_vector_remove(&worktrees, i); git_vector_remove(&worktrees, i);
git__free(worktree); git__free(worktree);
} }
@ -125,7 +134,7 @@ int git_worktree_lookup(git_worktree **out, git_repository *repo, const char *na
if ((error = git_buf_printf(&path, "%s/worktrees/%s", repo->commondir, name)) < 0) if ((error = git_buf_printf(&path, "%s/worktrees/%s", repo->commondir, name)) < 0)
goto out; goto out;
if (!is_worktree_dir(&path)) { if (!is_worktree_dir(path.ptr)) {
error = -1; error = -1;
goto out; goto out;
} }
@ -177,7 +186,7 @@ int git_worktree_validate(const git_worktree *wt)
assert(wt); assert(wt);
git_buf_puts(&buf, wt->gitdir_path); git_buf_puts(&buf, wt->gitdir_path);
if (!is_worktree_dir(&buf)) { if (!is_worktree_dir(buf.ptr)) {
giterr_set(GITERR_WORKTREE, giterr_set(GITERR_WORKTREE,
"Worktree gitdir ('%s') is not valid", "Worktree gitdir ('%s') is not valid",
wt->gitlink_path); wt->gitlink_path);