Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
79ab3ef6
Commit
79ab3ef6
authored
Oct 15, 2015
by
Patrick Steinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
repository: introduce is_worktree variable
parent
c5f3da96
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
0 deletions
+31
-0
include/git2/repository.h
+8
-0
src/repository.c
+11
-0
src/repository.h
+1
-0
tests/worktree/open.c
+11
-0
No files found.
include/git2/repository.h
View file @
79ab3ef6
...
...
@@ -468,6 +468,14 @@ GIT_EXTERN(int) git_repository_set_workdir(
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.
*
* If a configuration file has not been set, the default
...
...
src/repository.c
View file @
79ab3ef6
...
...
@@ -254,6 +254,7 @@ int git_repository_new(git_repository **out)
GITERR_CHECK_ALLOC
(
repo
);
repo
->
is_bare
=
1
;
repo
->
is_worktree
=
0
;
return
0
;
}
...
...
@@ -558,6 +559,7 @@ int git_repository_open_bare(
/* of course we're bare! */
repo
->
is_bare
=
1
;
repo
->
is_worktree
=
0
;
repo
->
workdir
=
NULL
;
*
repo_ptr
=
repo
;
...
...
@@ -772,6 +774,9 @@ int git_repository_open_ext(
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
* 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
;
}
int
git_repository_is_worktree
(
git_repository
*
repo
)
{
assert
(
repo
);
return
repo
->
is_worktree
;
}
int
git_repository_set_bare
(
git_repository
*
repo
)
{
int
error
;
...
...
src/repository.h
View file @
79ab3ef6
...
...
@@ -138,6 +138,7 @@ struct git_repository {
git_array_t
(
git_buf
)
reserved_names
;
unsigned
is_bare
:
1
;
unsigned
is_worktree
:
1
;
unsigned
int
lru_counter
;
...
...
tests/worktree/open.c
View file @
79ab3ef6
#include "clar_libgit2.h"
#include "repository.h"
#include "worktree_helpers.h"
#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_workdir
(
fixture
.
worktree
)
!=
NULL
);
cl_assert
(
!
fixture
.
repo
->
is_worktree
);
cl_assert
(
fixture
.
worktree
->
is_worktree
);
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_workdir
(
fixture
.
worktree
)
!=
NULL
);
cl_assert
(
!
fixture
.
repo
->
is_worktree
);
cl_assert
(
fixture
.
worktree
->
is_worktree
);
cleanup_fixture_worktree
(
&
fixture
);
}
...
...
@@ -55,6 +62,10 @@ void test_worktree_open__submodule_worktree_child(void)
"submodules/testrepo/.git"
));
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
(
&
parent_fixture
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment