Merge pull request libgit2#3537 from libgit2/cmn/tree-is-sorted

ethomson · ethomson · commit d698929cdd17 · 2015-12-08T13:12:27.000-05:00
tree: mark a tree as already sorted
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,10 @@ v0.23 + 1
 * You can now set your own user-agent to be sent for HTTP requests by
   using the `GIT_OPT_SET_USER_AGENT` with `git_libgit2_opts()`.
 
+* Tree objects are now assumed to be sorted. If a tree is not
+  correctly formed, it will give bad results. This is the git approach
+  and cuts a significant amount of time when reading the trees.
+
 ### API additions
 
 * `git_config_lock()` has been added, which allow for
diff --git a/src/tree.c b/src/tree.c
@@ -476,7 +476,8 @@ int git_tree__parse(void *_tree, git_odb_object *odb_obj)
 		buffer += GIT_OID_RAWSZ;
 	}
 
-	git_vector_sort(&tree->entries);
+	/* The tree is sorted by definition. Bad inputs give bad outputs */
+	tree->entries.flags |= GIT_VECTOR_SORTED;
 
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,8 @@ int git_tree__parse(void _tree, git_odb_object odb_obj)`
`476`	`476`	`buffer += GIT_OID_RAWSZ;`
`477`	`477`	`}`
`478`	`478`
`479`		`- git_vector_sort(&tree->entries);`
	`479`	`+ /* The tree is sorted by definition. Bad inputs give bad outputs */`
	`480`	`+ tree->entries.flags \|= GIT_VECTOR_SORTED;`
`480`	`481`
`481`	`482`	`return 0;`
`482`	`483`	`}`