Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ba52879

Browse files
carlosmnEdward Thomson
authored and
Edward Thomson
committed
reset: use real ids for the tests
This lets us run with strict object creation on.
1 parent 3e2e824 commit ba52879

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/reset/hard.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ static void unmerged_index_init(git_index *index, int entries)
122122
int write_theirs = 4;
123123
git_oid ancestor, ours, theirs;
124124

125-
git_oid_fromstr(&ancestor, "6bb0d9f700543ba3d318ba7075fc3bd696b4287b");
126-
git_oid_fromstr(&ours, "b19a1e93bec1317dc6097229e12afaffbfa74dc2");
127-
git_oid_fromstr(&theirs, "950b81b7eee953d050aa05a641f8e056c85dd1bd");
125+
git_oid_fromstr(&ancestor, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
126+
git_oid_fromstr(&ours, "32504b727382542f9f089e24fddac5e78533e96c");
127+
git_oid_fromstr(&theirs, "061d42a44cacde5726057b67558821d95db96f19");
128128

129129
cl_git_rewritefile("status/conflicting_file", "conflicting file\n");
130130

0 commit comments

Comments
 (0)