mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-08 04:30:48 +00:00
blob: fail to create a blob from a dir with EDIRECTORY
This also affects `git_index_add_bypath()` by providing a better error message and a specific error code when a directory is passed.
This commit is contained in:
parent
7624b91fd3
commit
aafaa491ba
@ -185,6 +185,12 @@ int git_blob__create_from_paths(
|
||||
(error = git_repository_odb(&odb, repo)) < 0)
|
||||
goto done;
|
||||
|
||||
if (S_ISDIR(st.st_mode)) {
|
||||
giterr_set(GITERR_ODB, "cannot create blob from '%s'; it is a directory", content_path);
|
||||
error = GIT_EDIRECTORY;
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (out_st)
|
||||
memcpy(out_st, &st, sizeof(st));
|
||||
|
||||
|
23
tests/index/bypath.c
Normal file
23
tests/index/bypath.c
Normal file
@ -0,0 +1,23 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "repository.h"
|
||||
#include "../submodule/submodule_helpers.h"
|
||||
|
||||
static git_repository *g_repo;
|
||||
static git_index *g_idx;
|
||||
|
||||
void test_index_bypath__initialize(void)
|
||||
{
|
||||
g_repo = setup_fixture_submod2();
|
||||
cl_git_pass(git_repository_index__weakptr(&g_idx, g_repo));
|
||||
}
|
||||
|
||||
void test_index_bypath__cleanup(void)
|
||||
{
|
||||
g_repo = NULL;
|
||||
g_idx = NULL;
|
||||
}
|
||||
|
||||
void test_index_bypath__add_directory(void)
|
||||
{
|
||||
cl_git_fail_with(GIT_EDIRECTORY, git_index_add_bypath(g_idx, "just_a_dir"));
|
||||
}
|
@ -4,6 +4,7 @@
|
||||
#include "submodule_helpers.h"
|
||||
#include "config/config_helpers.h"
|
||||
#include "fileops.h"
|
||||
#include "repository.h"
|
||||
|
||||
static git_repository *g_repo = NULL;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user