mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-29 18:38:58 +00:00
repository: ensure that the path to the .git directory ends with a forward slash when opening a repository through a working directory path
This fixes an issue which was detected while using one of the libgit2 bindings [0]. The lack of the trailing forward slash led the name of references returned by git_reference_listall() to be prefixed with a forward slash. [0]: https://github.com/libgit2/libgit2sharp/pull/108
This commit is contained in:
parent
0a4aebb097
commit
99abb79d53
@ -166,7 +166,7 @@ int git_repository_open(git_repository **repo_out, const char *path)
|
||||
* of the working dir, by testing if it contains a `.git`
|
||||
* folder inside of it.
|
||||
*/
|
||||
git_path_contains_dir(&path_buf, DOT_GIT, 1); /* append on success */
|
||||
git_path_contains_dir(&path_buf, GIT_DIR, 1); /* append on success */
|
||||
/* ignore error, since it just means `path/.git` doesn't exist */
|
||||
|
||||
if (quickcheck_repository_dir(&path_buf) < GIT_SUCCESS) {
|
||||
|
36
tests-clar/refs/listall.c
Normal file
36
tests-clar/refs/listall.c
Normal file
@ -0,0 +1,36 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "posix.h"
|
||||
|
||||
static git_repository *repo;
|
||||
static git_strarray ref_list;
|
||||
|
||||
static void ensure_no_refname_starts_with_a_forward_slash(const char *path)
|
||||
{
|
||||
int i;
|
||||
|
||||
cl_git_pass(git_repository_open(&repo, path));
|
||||
cl_git_pass(git_reference_listall(&ref_list, repo, GIT_REF_LISTALL));
|
||||
|
||||
cl_assert(ref_list.count > 0);
|
||||
|
||||
for (i = 0; i < ref_list.count; i++)
|
||||
cl_assert(git__prefixcmp(ref_list.strings[i], "/") != 0);
|
||||
|
||||
git_strarray_free(&ref_list);
|
||||
git_repository_free(repo);
|
||||
}
|
||||
|
||||
void test_refs_listall__from_repository_opened_through_workdir_path(void)
|
||||
{
|
||||
cl_fixture_sandbox("status");
|
||||
cl_git_pass(p_rename("status/.gitted", "status/.git"));
|
||||
|
||||
ensure_no_refname_starts_with_a_forward_slash("status");
|
||||
|
||||
cl_fixture_cleanup("status");
|
||||
}
|
||||
|
||||
void test_refs_listall__from_repository_opened_through_gitdir_path(void)
|
||||
{
|
||||
ensure_no_refname_starts_with_a_forward_slash(cl_fixture("testrepo.git"));
|
||||
}
|
@ -1,24 +1,46 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "posix.h"
|
||||
|
||||
static git_repository *repo;
|
||||
|
||||
void test_repo_open__cleanup(void)
|
||||
{
|
||||
git_repository_free(repo);
|
||||
}
|
||||
|
||||
void test_repo_open__bare_empty_repo(void)
|
||||
{
|
||||
git_repository *repo;
|
||||
|
||||
cl_git_pass(git_repository_open(&repo, cl_fixture("empty_bare.git")));
|
||||
|
||||
cl_assert(git_repository_path(repo) != NULL);
|
||||
cl_assert(git__suffixcmp(git_repository_path(repo), "/") == 0);
|
||||
|
||||
cl_assert(git_repository_workdir(repo) == NULL);
|
||||
|
||||
git_repository_free(repo);
|
||||
}
|
||||
|
||||
void test_repo_open__standard_empty_repo(void)
|
||||
void test_repo_open__standard_empty_repo_through_gitdir(void)
|
||||
{
|
||||
git_repository *repo;
|
||||
|
||||
cl_git_pass(git_repository_open(&repo, cl_fixture("empty_standard_repo/.gitted")));
|
||||
cl_assert(git_repository_path(repo) != NULL);
|
||||
cl_assert(git_repository_workdir(repo) != NULL);
|
||||
|
||||
git_repository_free(repo);
|
||||
cl_assert(git_repository_path(repo) != NULL);
|
||||
cl_assert(git__suffixcmp(git_repository_path(repo), "/") == 0);
|
||||
|
||||
cl_assert(git_repository_workdir(repo) != NULL);
|
||||
cl_assert(git__suffixcmp(git_repository_workdir(repo), "/") == 0);
|
||||
}
|
||||
|
||||
void test_repo_open__standard_empty_repo_through_workdir(void)
|
||||
{
|
||||
cl_fixture_sandbox("empty_standard_repo");
|
||||
cl_git_pass(p_rename("empty_standard_repo/.gitted", "empty_standard_repo/.git"));
|
||||
|
||||
cl_git_pass(git_repository_open(&repo, "empty_standard_repo"));
|
||||
|
||||
cl_assert(git_repository_path(repo) != NULL);
|
||||
cl_assert(git__suffixcmp(git_repository_path(repo), "/") == 0);
|
||||
|
||||
cl_assert(git_repository_workdir(repo) != NULL);
|
||||
cl_assert(git__suffixcmp(git_repository_workdir(repo), "/") == 0);
|
||||
|
||||
cl_fixture_cleanup("empty_standard_repo");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user