mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-05 22:55:47 +00:00
14997dc5f6
This cleans up some additional issues. The main change is that on a filesystem that doesn't support mode bits, libgit2 will now create new blobs with GIT_FILEMODE_BLOB always instead of being at the mercy to the filesystem driver to report executable or not. This means that if "core.filemode" lies and claims that filemode is not supported, then we will ignore the executable bit from the filesystem. Previously we would have allowed it. This adds an option to the new git_repository_reset_filesystem to recurse through submodules if desired. There may be other types of APIs that would like a "recurse submodules" option, but this one is particularly useful. This also has a number of cleanups, etc., for related things including trying to give better error messages when problems come up from the filesystem. For example, the FAT filesystem driver on MacOS appears to return errno EINVAL if you attempt to write a filename with invalid UTF-8 in it. We try to capture that with a better error message now.
155 lines
4.7 KiB
C
155 lines
4.7 KiB
C
#include "clar_libgit2.h"
|
|
#include "buffer.h"
|
|
#include "posix.h"
|
|
#include "index.h"
|
|
|
|
static git_repository *g_repo = NULL;
|
|
|
|
void test_index_filemodes__initialize(void)
|
|
{
|
|
g_repo = cl_git_sandbox_init("filemodes");
|
|
}
|
|
|
|
void test_index_filemodes__cleanup(void)
|
|
{
|
|
cl_git_sandbox_cleanup();
|
|
}
|
|
|
|
void test_index_filemodes__read(void)
|
|
{
|
|
git_index *index;
|
|
unsigned int i;
|
|
static bool expected[6] = { 0, 1, 0, 1, 0, 1 };
|
|
|
|
cl_git_pass(git_repository_index(&index, g_repo));
|
|
cl_assert_equal_i(6, (int)git_index_entrycount(index));
|
|
|
|
for (i = 0; i < 6; ++i) {
|
|
const git_index_entry *entry = git_index_get_byindex(index, i);
|
|
cl_assert(entry != NULL);
|
|
cl_assert(((entry->mode & 0100) ? 1 : 0) == expected[i]);
|
|
}
|
|
|
|
git_index_free(index);
|
|
}
|
|
|
|
static void replace_file_with_mode(
|
|
const char *filename, const char *backup, unsigned int create_mode)
|
|
{
|
|
git_buf path = GIT_BUF_INIT, content = GIT_BUF_INIT;
|
|
|
|
cl_git_pass(git_buf_joinpath(&path, "filemodes", filename));
|
|
cl_git_pass(git_buf_printf(&content, "%s as %08u (%d)",
|
|
filename, create_mode, rand()));
|
|
|
|
cl_git_pass(p_rename(path.ptr, backup));
|
|
cl_git_write2file(
|
|
path.ptr, content.ptr, content.size,
|
|
O_WRONLY|O_CREAT|O_TRUNC, create_mode);
|
|
|
|
git_buf_free(&path);
|
|
git_buf_free(&content);
|
|
}
|
|
|
|
#define add_and_check_mode(I,F,X) add_and_check_mode_(I,F,X,__FILE__,__LINE__)
|
|
|
|
static void add_and_check_mode_(
|
|
git_index *index, const char *filename, unsigned int expect_mode,
|
|
const char *file, int line)
|
|
{
|
|
size_t pos;
|
|
const git_index_entry *entry;
|
|
|
|
cl_git_pass(git_index_add_bypath(index, filename));
|
|
|
|
clar__assert(!git_index_find(&pos, index, filename),
|
|
file, line, "Cannot find index entry", NULL, 1);
|
|
|
|
entry = git_index_get_byindex(index, pos);
|
|
|
|
clar__assert_equal(file, line, "Expected mode does not match index",
|
|
1, "%07o", (unsigned int)entry->mode, (unsigned int)expect_mode);
|
|
}
|
|
|
|
void test_index_filemodes__untrusted(void)
|
|
{
|
|
git_index *index;
|
|
|
|
cl_repo_set_bool(g_repo, "core.filemode", false);
|
|
|
|
cl_git_pass(git_repository_index(&index, g_repo));
|
|
cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) != 0);
|
|
|
|
/* 1 - add 0644 over existing 0644 -> expect 0644 */
|
|
replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644);
|
|
add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB);
|
|
|
|
/* 2 - add 0644 over existing 0755 -> expect 0755 */
|
|
replace_file_with_mode("exec_on", "filemodes/exec_on.0", 0644);
|
|
add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB_EXECUTABLE);
|
|
|
|
/* 3 - add 0755 over existing 0644 -> expect 0644 */
|
|
replace_file_with_mode("exec_off", "filemodes/exec_off.1", 0755);
|
|
add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB);
|
|
|
|
/* 4 - add 0755 over existing 0755 -> expect 0755 */
|
|
replace_file_with_mode("exec_on", "filemodes/exec_on.1", 0755);
|
|
add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB_EXECUTABLE);
|
|
|
|
/* 5 - add new 0644 -> expect 0644 */
|
|
cl_git_write2file("filemodes/new_off", "blah", 0,
|
|
O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
|
add_and_check_mode(index, "new_off", GIT_FILEMODE_BLOB);
|
|
|
|
/* 6 - add new 0755 -> expect 0644 if core.filemode == false */
|
|
cl_git_write2file("filemodes/new_on", "blah", 0,
|
|
O_WRONLY | O_CREAT | O_TRUNC, 0755);
|
|
add_and_check_mode(index, "new_on", GIT_FILEMODE_BLOB);
|
|
|
|
git_index_free(index);
|
|
}
|
|
|
|
void test_index_filemodes__trusted(void)
|
|
{
|
|
git_index *index;
|
|
|
|
/* Only run these tests on platforms where I can actually
|
|
* chmod a file and get the stat results I expect!
|
|
*/
|
|
if (!cl_is_chmod_supported())
|
|
return;
|
|
|
|
cl_repo_set_bool(g_repo, "core.filemode", true);
|
|
|
|
cl_git_pass(git_repository_index(&index, g_repo));
|
|
cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) == 0);
|
|
|
|
/* 1 - add 0644 over existing 0644 -> expect 0644 */
|
|
replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644);
|
|
add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB);
|
|
|
|
/* 2 - add 0644 over existing 0755 -> expect 0644 */
|
|
replace_file_with_mode("exec_on", "filemodes/exec_on.0", 0644);
|
|
add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB);
|
|
|
|
/* 3 - add 0755 over existing 0644 -> expect 0755 */
|
|
replace_file_with_mode("exec_off", "filemodes/exec_off.1", 0755);
|
|
add_and_check_mode(index, "exec_off", GIT_FILEMODE_BLOB_EXECUTABLE);
|
|
|
|
/* 4 - add 0755 over existing 0755 -> expect 0755 */
|
|
replace_file_with_mode("exec_on", "filemodes/exec_on.1", 0755);
|
|
add_and_check_mode(index, "exec_on", GIT_FILEMODE_BLOB_EXECUTABLE);
|
|
|
|
/* 5 - add new 0644 -> expect 0644 */
|
|
cl_git_write2file("filemodes/new_off", "blah", 0,
|
|
O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
|
add_and_check_mode(index, "new_off", GIT_FILEMODE_BLOB);
|
|
|
|
/* 6 - add 0755 -> expect 0755 */
|
|
cl_git_write2file("filemodes/new_on", "blah", 0,
|
|
O_WRONLY | O_CREAT | O_TRUNC, 0755);
|
|
add_and_check_mode(index, "new_on", GIT_FILEMODE_BLOB_EXECUTABLE);
|
|
|
|
git_index_free(index);
|
|
}
|