summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2016-04-11 11:37:02 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2016-04-11 11:37:02 +0200
commitd916d508dd6639bc777190f1118595a1d8339284 (patch)
tree9c453b7af731d5bb711826ae7c36b7e969fffd3b
parent9bf157d2c971e25f3962f9525d86230e9586ba6b (diff)
downloadlibgit2-cmn/strict-object.tar.gz
reset: use real ids for the testscmn/strict-object
This lets us run with strict object creation on.
-rw-r--r--tests/reset/hard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/reset/hard.c b/tests/reset/hard.c
index 0c0af914c..e461f8093 100644
--- a/tests/reset/hard.c
+++ b/tests/reset/hard.c
@@ -122,9 +122,9 @@ static void unmerged_index_init(git_index *index, int entries)
int write_theirs = 4;
git_oid ancestor, ours, theirs;
- git_oid_fromstr(&ancestor, "6bb0d9f700543ba3d318ba7075fc3bd696b4287b");
- git_oid_fromstr(&ours, "b19a1e93bec1317dc6097229e12afaffbfa74dc2");
- git_oid_fromstr(&theirs, "950b81b7eee953d050aa05a641f8e056c85dd1bd");
+ git_oid_fromstr(&ancestor, "452e4244b5d083ddf0460acf1ecc74db9dcfa11a");
+ git_oid_fromstr(&ours, "32504b727382542f9f089e24fddac5e78533e96c");
+ git_oid_fromstr(&theirs, "061d42a44cacde5726057b67558821d95db96f19");
cl_git_rewritefile("status/conflicting_file", "conflicting file\n");