diff options
Diffstat (limited to 'tests/checkout/conflict.c')
-rw-r--r-- | tests/checkout/conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index abfd9b7c7..914b3c2de 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -156,7 +156,7 @@ static void ensure_workdir_oid(const char *path, const char *oid_str) git_oid expected, actual; cl_git_pass(git_oid_fromstr(&expected, oid_str)); - cl_git_pass(git_repository_hashfile(&actual, g_repo, path, GIT_OBJ_BLOB, NULL)); + cl_git_pass(git_repository_hashfile(&actual, g_repo, path, GIT_OBJECT_BLOB, NULL)); cl_assert_equal_oid(&expected, &actual); } |