diff options
| -rw-r--r-- | src/repository.c | 10 | ||||
| -rw-r--r-- | src/worktree.c | 2 | ||||
| -rw-r--r-- | tests/worktree/worktree.c | 20 |
3 files changed, 28 insertions, 4 deletions
diff --git a/src/repository.c b/src/repository.c index 90b778e03..3c8987990 100644 --- a/src/repository.c +++ b/src/repository.c @@ -268,11 +268,15 @@ static int load_config_data(git_repository *repo, const git_config *config) { int is_bare; + int err = git_config_get_bool(&is_bare, config, "core.bare"); + if (err < 0 && err != GIT_ENOTFOUND) + return err; + /* Try to figure out if it's bare, default to non-bare if it's not set */ - if (git_config_get_bool(&is_bare, config, "core.bare") < 0) - repo->is_bare = 0; + if (err != GIT_ENOTFOUND) + repo->is_bare = is_bare && !repo->is_worktree; else - repo->is_bare = is_bare; + repo->is_bare = 0; return 0; } diff --git a/src/worktree.c b/src/worktree.c index 30f03ddc0..48d3ef9ff 100644 --- a/src/worktree.c +++ b/src/worktree.c @@ -139,7 +139,7 @@ static int open_worktree_dir(git_worktree **out, const char *parent, const char if ((wt->name = git__strdup(name)) == NULL || (wt->commondir_path = git_worktree__read_link(dir, "commondir")) == NULL || (wt->gitlink_path = git_worktree__read_link(dir, "gitdir")) == NULL - || (wt->parent_path = git__strdup(parent)) == NULL + || (parent && (wt->parent_path = git__strdup(parent)) == NULL) || (wt->worktree_path = git_path_dirname(wt->gitlink_path)) == NULL) { error = -1; goto out; diff --git a/tests/worktree/worktree.c b/tests/worktree/worktree.c index 70ccd506f..cbdd0847d 100644 --- a/tests/worktree/worktree.c +++ b/tests/worktree/worktree.c @@ -228,6 +228,26 @@ void test_worktree_worktree__init(void) git_repository_free(repo); } +void test_worktree_worktree__add_from_bare(void) +{ + git_worktree *wt; + git_repository *repo, *wtrepo; + + repo = cl_git_sandbox_init("short_tag.git"); + + cl_assert_equal_i(1, git_repository_is_bare(repo)); + cl_assert_equal_i(0, git_repository_is_worktree(repo)); + + cl_git_pass(git_worktree_add(&wt, repo, "worktree-frombare", "worktree-frombare", NULL)); + cl_git_pass(git_repository_open(&wtrepo, "worktree-frombare")); + cl_assert_equal_i(0, git_repository_is_bare(wtrepo)); + cl_assert_equal_i(1, git_repository_is_worktree(wtrepo)); + + git_worktree_free(wt); + git_repository_free(repo); + git_repository_free(wtrepo); +} + void test_worktree_worktree__add_locked(void) { git_worktree *wt; |