Commit b31f50fd by Ian Hattendorf Committed by Edward Thomson

Default to GIT_BRANCH_DEFAULT if init.defaultBranch is empty string

We already do this in repo_init_head
parent 8b16a4aa
...@@ -2365,10 +2365,11 @@ int git_repository_initialbranch(git_buf *out, git_repository *repo) ...@@ -2365,10 +2365,11 @@ int git_repository_initialbranch(git_buf *out, git_repository *repo)
if ((error = git_repository_config__weakptr(&config, repo)) < 0) if ((error = git_repository_config__weakptr(&config, repo)) < 0)
return error; return error;
if ((error = git_config_get_entry(&entry, config, "init.defaultbranch")) == 0) { if ((error = git_config_get_entry(&entry, config, "init.defaultbranch")) == 0 &&
*entry->value) {
branch = entry->value; branch = entry->value;
} }
else if (error == GIT_ENOTFOUND) { else if (!error || error == GIT_ENOTFOUND) {
branch = GIT_BRANCH_DEFAULT; branch = GIT_BRANCH_DEFAULT;
} }
else { else {
......
#include "clar_libgit2.h" #include "clar_libgit2.h"
#include "repo/repo_helpers.h"
void test_repo_getters__is_empty_correctly_deals_with_pristine_looking_repos(void) void test_repo_getters__is_empty_correctly_deals_with_pristine_looking_repos(void)
{ {
...@@ -23,6 +24,18 @@ void test_repo_getters__is_empty_can_detect_used_repositories(void) ...@@ -23,6 +24,18 @@ void test_repo_getters__is_empty_can_detect_used_repositories(void)
git_repository_free(repo); git_repository_free(repo);
} }
void test_repo_getters__is_empty_can_detect_repositories_with_defaultbranch_config_empty(void)
{
git_repository *repo;
create_tmp_global_config("tmp_global_path", "init.defaultBranch", "");
cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git")));
cl_assert_equal_i(false, git_repository_is_empty(repo));
git_repository_free(repo);
}
void test_repo_getters__retrieving_the_odb_honors_the_refcount(void) void test_repo_getters__retrieving_the_odb_honors_the_refcount(void)
{ {
git_odb *odb; git_odb *odb;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment