proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 18:22:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

repository: introduce is_worktree variable

Browse Source
This commit is contained in:
Patrick Steinhardt 2015-10-15 15:58:05 +02:00
parent c5f3da9692
commit 79ab3ef69f
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/git2/repository.h
View File

@ -467,6 +467,14 @@ GIT_EXTERN(int) git_repository_set_workdir(
*/ */
GIT_EXTERN(int) git_repository_is_bare(git_repository *repo); GIT_EXTERN(int) git_repository_is_bare(git_repository *repo);
/**
* Check if a repository is a linked work tree
*
* @param repo Repo to test
* @return 1 if the repository is a linked work tree, 0 otherwise.
*/
GIT_EXTERN(int) git_repository_is_worktree(git_repository *repo);
/** /**
* Get the configuration file for this repository. * Get the configuration file for this repository.
* *

11
src/repository.c
View File

@ -254,6 +254,7 @@ int git_repository_new(git_repository **out)
GITERR_CHECK_ALLOC(repo); GITERR_CHECK_ALLOC(repo);
repo->is_bare = 1; repo->is_bare = 1;
repo->is_worktree = 0;
return 0; return 0;
} }
@ -558,6 +559,7 @@ int git_repository_open_bare(
/* of course we're bare! */ /* of course we're bare! */
repo->is_bare = 1; repo->is_bare = 1;
repo->is_worktree = 0;
repo->workdir = NULL; repo->workdir = NULL;
*repo_ptr = repo; *repo_ptr = repo;
@ -772,6 +774,9 @@ int git_repository_open_ext(
GITERR_CHECK_ALLOC(repo->commondir); GITERR_CHECK_ALLOC(repo->commondir);
} }
if (repo->path_gitlink && repo->commondir && strcmp(repo->path_gitlink, repo->commondir))
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
* care if it's not there, so we need to deal with that. * care if it's not there, so we need to deal with that.
@ -2186,6 +2191,12 @@ int git_repository_is_bare(git_repository *repo)
return repo->is_bare; return repo->is_bare;
} }
int git_repository_is_worktree(git_repository *repo)
{
assert(repo);
return repo->is_worktree;
}
int git_repository_set_bare(git_repository *repo) int git_repository_set_bare(git_repository *repo)
{ {
int error; int error;

1
src/repository.h
View File

@ -138,6 +138,7 @@ struct git_repository {
git_array_t(git_buf) reserved_names; git_array_t(git_buf) reserved_names;
unsigned is_bare:1; unsigned is_bare:1;
unsigned is_worktree:1;
unsigned int lru_counter; unsigned int lru_counter;

11
tests/worktree/open.c
View File

@ -1,4 +1,5 @@
#include "clar_libgit2.h" #include "clar_libgit2.h"
#include "repository.h"
#include "worktree_helpers.h" #include "worktree_helpers.h"
#define WORKTREE_PARENT "submodules-worktree-parent" #define WORKTREE_PARENT "submodules-worktree-parent"
@ -13,6 +14,9 @@ void test_worktree_open__repository(void)
cl_assert(git_repository_path(fixture.worktree) != NULL); cl_assert(git_repository_path(fixture.worktree) != NULL);
cl_assert(git_repository_workdir(fixture.worktree) != NULL); cl_assert(git_repository_workdir(fixture.worktree) != NULL);
cl_assert(!fixture.repo->is_worktree);
cl_assert(fixture.worktree->is_worktree);
cleanup_fixture_worktree(&fixture); cleanup_fixture_worktree(&fixture);
} }
@ -39,6 +43,9 @@ void test_worktree_open__submodule_worktree_parent(void)
cl_assert(git_repository_path(fixture.worktree) != NULL); cl_assert(git_repository_path(fixture.worktree) != NULL);
cl_assert(git_repository_workdir(fixture.worktree) != NULL); cl_assert(git_repository_workdir(fixture.worktree) != NULL);
cl_assert(!fixture.repo->is_worktree);
cl_assert(fixture.worktree->is_worktree);
cleanup_fixture_worktree(&fixture); cleanup_fixture_worktree(&fixture);
} }
@ -55,6 +62,10 @@ void test_worktree_open__submodule_worktree_child(void)
"submodules/testrepo/.git")); "submodules/testrepo/.git"));
setup_fixture_worktree(&child_fixture); setup_fixture_worktree(&child_fixture);
cl_assert(!parent_fixture.repo->is_worktree);
cl_assert(parent_fixture.worktree->is_worktree);
cl_assert(child_fixture.worktree->is_worktree);
cleanup_fixture_worktree(&child_fixture); cleanup_fixture_worktree(&child_fixture);
cleanup_fixture_worktree(&parent_fixture); cleanup_fixture_worktree(&parent_fixture);
} }