proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 23:37:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reset: use real ids for the tests

Browse Source 
This lets us run with strict object creation on.
This commit is contained in:
Carlos Martín Nieto 2016-04-11 11:37:02 +02:00 committed by Edward Thomson
parent 3e2e8240c0
commit ba52879b46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/reset/hard.c
View File

@ -122,9 +122,9 @@ static void unmerged_index_init(git_index *index, int entries)
int write_theirs = 4; int write_theirs = 4;
git_oid ancestor, ours, theirs; git_oid ancestor, ours, theirs;
git_oid_fromstr(&ancestor, "6bb0d9f700543ba3d318ba7075fc3bd696b4287b"); git_oid_fromstr(&ancestor, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
git_oid_fromstr(&ours, "b19a1e93bec1317dc6097229e12afaffbfa74dc2"); git_oid_fromstr(&ours, "32504b727382542f9f089e24fddac5e78533e96c");
git_oid_fromstr(&theirs, "950b81b7eee953d050aa05a641f8e056c85dd1bd"); git_oid_fromstr(&theirs, "061d42a44cacde5726057b67558821d95db96f19");
cl_git_rewritefile("status/conflicting_file", "conflicting file\n"); cl_git_rewritefile("status/conflicting_file", "conflicting file\n");