summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-06-24 17:51:45 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2014-06-24 17:51:45 +0200
commit5e37874dd43239afb0e611a1e4ef426c0614d905 (patch)
treebadc60ab1d0179612aed5e49a8101df97fd61fde /tests
parent130cb548011c95ddcbba4a61affc32e3b513ed5b (diff)
parentfcc60066073b746332eb859c7fccdcece150bfcc (diff)
downloadlibgit2-5e37874dd43239afb0e611a1e4ef426c0614d905.tar.gz
Merge remote-tracking branch 'upstream/cmn/treebuilder-perf'
Diffstat (limited to 'tests')
-rw-r--r--tests/object/tree/write.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/object/tree/write.c b/tests/object/tree/write.c
index 45356e807..ddb62e278 100644
--- a/tests/object/tree/write.c
+++ b/tests/object/tree/write.c
@@ -104,6 +104,7 @@ void test_object_tree_write__subtree(void)
void test_object_tree_write__sorted_subtrees(void)
{
git_treebuilder *builder;
+ git_tree *tree;
unsigned int i;
int position_c = -1, position_cake = -1, position_config = -1;
@@ -143,8 +144,9 @@ void test_object_tree_write__sorted_subtrees(void)
cl_git_pass(git_treebuilder_write(&tree_oid, g_repo, builder));
- for (i = 0; i < builder->entries.length; ++i) {
- git_tree_entry *entry = git_vector_get(&builder->entries, i);
+ cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid));
+ for (i = 0; i < git_tree_entrycount(tree); i++) {
+ const git_tree_entry *entry = git_tree_entry_byindex(tree, i);
if (strcmp(entry->filename, "c") == 0)
position_c = i;
@@ -156,6 +158,8 @@ void test_object_tree_write__sorted_subtrees(void)
position_config = i;
}
+ git_tree_free(tree);
+
cl_assert(position_c != -1);
cl_assert(position_cake != -1);
cl_assert(position_config != -1);