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/reset | |
| 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/reset')
| -rw-r--r-- | tests/reset/default.c | 2 | ||||
| -rw-r--r-- | tests/reset/hard.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/reset/default.c b/tests/reset/default.c index e29e63550..57a3f7c51 100644 --- a/tests/reset/default.c +++ b/tests/reset/default.c @@ -57,7 +57,7 @@ static void assert_content_in_index( if (!expected_shas) continue; - cl_git_pass(git_oid_streq(&entry->oid, expected_shas->strings[i])); + cl_git_pass(git_oid_streq(&entry->id, expected_shas->strings[i])); } else cl_assert_equal_i(should_exist, error != GIT_ENOTFOUND); } diff --git a/tests/reset/hard.c b/tests/reset/hard.c index 1c0c84135..0f80d32df 100644 --- a/tests/reset/hard.c +++ b/tests/reset/hard.c @@ -111,7 +111,7 @@ static void index_entry_init(git_index *index, int side, git_oid *oid) entry.path = "conflicting_file"; entry.flags = (side << GIT_IDXENTRY_STAGESHIFT); entry.mode = 0100644; - git_oid_cpy(&entry.oid, oid); + git_oid_cpy(&entry.id, oid); cl_git_pass(git_index_add(index, &entry)); } |