diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-24 11:36:41 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-01-25 08:15:44 +0100 |
| commit | d541170c77b7ac738e2ffcdd04c838fb7cbbfb87 (patch) | |
| tree | b4c829668eb8a1aa8db798bfdd31e95bb1a946e0 /tests/merge/workdir | |
| parent | d0a3de720e085d335d9ad46dc00a23dd03eda793 (diff) | |
| download | libgit2-d541170c77b7ac738e2ffcdd04c838fb7cbbfb87.tar.gz | |
index: rename an entry's id to 'id'
This was not converted when we converted the rest, so do it now.
Diffstat (limited to 'tests/merge/workdir')
| -rw-r--r-- | tests/merge/workdir/simple.c | 2 | ||||
| -rw-r--r-- | tests/merge/workdir/trivial.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index 6b152cc4d..266719e2a 100644 --- a/tests/merge/workdir/simple.c +++ b/tests/merge/workdir/simple.c @@ -696,7 +696,7 @@ void test_merge_workdir_simple__binary(void) cl_assert((binary_entry = git_index_get_bypath(repo_index, "binary", 0)) != NULL); cl_git_pass(git_oid_fromstr(&our_file_oid, "23ed141a6ae1e798b2f721afedbe947c119111ba")); - cl_assert(git_oid_cmp(&binary_entry->oid, &our_file_oid) == 0); + cl_assert(git_oid_cmp(&binary_entry->id, &our_file_oid) == 0); git_merge_head_free(their_head); git_merge_result_free(result); diff --git a/tests/merge/workdir/trivial.c b/tests/merge/workdir/trivial.c index 71437d48e..a6bbbf095 100644 --- a/tests/merge/workdir/trivial.c +++ b/tests/merge/workdir/trivial.c @@ -226,7 +226,7 @@ void test_merge_workdir_trivial__13(void) cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-13.txt", 0)); cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b")); - cl_assert(git_oid_cmp(&entry->oid, &expected_oid) == 0); + cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); cl_assert(git_index_reuc_entrycount(repo_index) == 0); cl_assert(merge_trivial_conflict_entrycount() == 0); @@ -242,7 +242,7 @@ void test_merge_workdir_trivial__14(void) cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-14-branch.txt", 0)); cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9")); - cl_assert(git_oid_cmp(&entry->oid, &expected_oid) == 0); + cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); cl_assert(git_index_reuc_entrycount(repo_index) == 0); cl_assert(merge_trivial_conflict_entrycount() == 0); |