Merge branch 'mh/ref-api'

gitster · gitster · commit ec04a275b495 · 2012-05-25T12:04:36.000-07:00
Fixes a performance regression in the earlier series.
diff --git a/refs.c b/refs.c
@@ -273,6 +273,12 @@ static void add_entry_to_dir(struct ref_dir *dir, struct ref_entry *entry)
 {
 	ALLOC_GROW(dir->entries, dir->nr + 1, dir->alloc);
 	dir->entries[dir->nr++] = entry;
+	/* optimize for the case that entries are added in order */
+	if (dir->nr == 1 ||
+	    (dir->nr == dir->sorted + 1 &&
+	     strcmp(dir->entries[dir->nr - 2]->name,
+		    dir->entries[dir->nr - 1]->name) < 0))
+		dir->sorted = dir->nr;
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,12 @@ static void add_entry_to_dir(struct ref_dir dir, struct ref_entry entry)`
`273`	`273`	`{`
`274`	`274`	`ALLOC_GROW(dir->entries, dir->nr + 1, dir->alloc);`
`275`	`275`	`dir->entries[dir->nr++] = entry;`
	`276`	`+ /* optimize for the case that entries are added in order */`
	`277`	`+ if (dir->nr == 1 \|\|`
	`278`	`+ (dir->nr == dir->sorted + 1 &&`
	`279`	`+ strcmp(dir->entries[dir->nr - 2]->name,`
	`280`	`+ dir->entries[dir->nr - 1]->name) < 0))`
	`281`	`+ dir->sorted = dir->nr;`
`276`	`282`	`}`
`277`	`283`
`278`	`284`	`/*`