proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-21 20:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge::workdir::dirty: tick idx to defeat racy-git

Browse Source
This commit is contained in:
Edward Thomson 2015-06-16 16:34:25 -04:00
parent 121c3171e5
commit fef5344c50
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/merge/workdir/dirty.c
View File

@ -2,6 +2,7 @@
#include "git2/merge.h" #include "git2/merge.h"
#include "buffer.h" #include "buffer.h"
#include "merge.h" #include "merge.h"
#include "index.h"
#include "../merge_helpers.h" #include "../merge_helpers.h"
#include "posix.h" #include "posix.h"
@ -231,9 +232,20 @@ static int merge_differently_filtered_files(char *files[])
cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL)); cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL));
/* Emulate checkout with a broken or misconfigured filter: modify some
* files on-disk and then update the index with the updated file size
* and time, as if some filter applied them. These files should not be
* treated as dirty since we created them.
*
* (Make sure to update the index stamp to defeat racy-git protections
* trying to sanity check the files in the index; those would rehash the
* files, showing them as dirty, the exact mechanism we're trying to avoid.)
*/
write_files(files); write_files(files);
hack_index(files); hack_index(files);
repo_index->stamp.mtime = time(NULL) + 1;
cl_git_pass(git_index_write(repo_index)); cl_git_pass(git_index_write(repo_index));
error = merge_branch(); error = merge_branch();