mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-21 18:03:54 +00:00
commit
e79a2998cb
@ -617,7 +617,7 @@ int git_filter_list_apply_to_data(
|
||||
si = di; /* swap buffers */
|
||||
} else {
|
||||
tgt->size = 0;
|
||||
return error;
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
@ -625,9 +625,10 @@ int git_filter_list_apply_to_data(
|
||||
if (si != 1)
|
||||
git_buf_swap(dbuffer[0], dbuffer[1]);
|
||||
|
||||
cleanup:
|
||||
git_buf_free(&local); /* don't leak if we allocated locally */
|
||||
|
||||
return 0;
|
||||
return error;
|
||||
}
|
||||
|
||||
int git_filter_list_apply_to_file(
|
||||
|
@ -185,23 +185,20 @@ void test_reset_default__resetting_unknown_filepaths_does_not_fail(void)
|
||||
|
||||
void test_reset_default__staged_rename_reset_delete(void)
|
||||
{
|
||||
git_index *idx;
|
||||
git_index_entry entry;
|
||||
const git_index_entry *existing;
|
||||
char *paths[] = { "new.txt" };
|
||||
|
||||
initialize("testrepo2");
|
||||
|
||||
cl_git_pass(git_repository_index(&idx, _repo));
|
||||
|
||||
existing = git_index_get_bypath(idx, "new.txt", 0);
|
||||
existing = git_index_get_bypath(_index, "new.txt", 0);
|
||||
cl_assert(existing);
|
||||
memcpy(&entry, existing, sizeof(entry));
|
||||
|
||||
cl_git_pass(git_index_remove_bypath(idx, "new.txt"));
|
||||
cl_git_pass(git_index_remove_bypath(_index, "new.txt"));
|
||||
|
||||
entry.path = "renamed.txt";
|
||||
cl_git_pass(git_index_add(idx, &entry));
|
||||
cl_git_pass(git_index_add(_index, &entry));
|
||||
|
||||
_pathspecs.strings = paths;
|
||||
_pathspecs.count = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user