Commit 26bf94c0 by Laurence McGlashan

If longpaths is true and filters are enabled, pass git_repository through the…

If longpaths is true and filters are enabled, pass git_repository through the filtering code to ensure the cached longpath setting is returned.

Fixes: #6054
parent f1b89a20
......@@ -138,12 +138,13 @@ static int write_file_filtered(
git_object_size_t *size,
git_odb *odb,
const char *full_path,
git_filter_list *fl)
git_filter_list *fl,
git_repository* repo)
{
int error;
git_buf tgt = GIT_BUF_INIT;
error = git_filter_list_apply_to_file(&tgt, fl, NULL, full_path);
error = git_filter_list_apply_to_file(&tgt, fl, repo, full_path);
/* Write the file to disk if it was properly filtered */
if (!error) {
......@@ -238,7 +239,7 @@ int git_blob__create_from_paths(
error = write_file_stream(id, odb, content_path, size);
else {
/* We need to apply one or more filters */
error = write_file_filtered(id, &size, odb, content_path, fl);
error = write_file_filtered(id, &size, odb, content_path, fl, repo);
git_filter_list_free(fl);
}
......
......@@ -90,3 +90,31 @@ void test_win32_longpath__status_and_add(void)
git_buf_dispose(&out);
#endif
}
void test_win32_longpath__status_and_add_with_filter(void)
{
#ifdef GIT_WIN32
git_repository *repo = cl_git_sandbox_init("testrepo");
git_index *index;
git_buf out = GIT_BUF_INIT;
unsigned int status_flags;
cl_repo_set_bool(repo, "core.longpaths", true);
cl_repo_set_bool(repo, "core.autocrlf", true);
cl_git_pass(git_repository_workdir_path(&out, repo, LONG_FILENAME));
cl_git_rewritefile(out.ptr, "This is a long path.\r\n");
cl_git_pass(git_status_file(&status_flags, repo, LONG_FILENAME));
cl_assert_equal_i(GIT_STATUS_WT_NEW, status_flags);
cl_git_pass(git_repository_index(&index, repo));
cl_git_pass(git_index_add_bypath(index, LONG_FILENAME));
cl_git_pass(git_status_file(&status_flags, repo, LONG_FILENAME));
cl_assert_equal_i(GIT_STATUS_INDEX_NEW, status_flags);
git_index_free(index);
git_buf_dispose(&out);
#endif
}
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