Merge branch 'jh/object-filtering'

gitster · gitster · commit ba82fdaea3ab · 2018-01-11T13:16:37.000-08:00
Hotfix for a topic already in 'master'.

* jh/object-filtering:
  oidset: don't return value from oidset_init
diff --git a/oidset.h b/oidset.h
@@ -27,7 +27,7 @@ struct oidset {
 
 static inline void oidset_init(struct oidset *set, size_t initial_size)
 {
-	return oidmap_init(&set->map, initial_size);
+	oidmap_init(&set->map, initial_size);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ struct oidset {`
`27`	`27`
`28`	`28`	`static inline void oidset_init(struct oidset *set, size_t initial_size)`
`29`	`29`	`{`
`30`		`- return oidmap_init(&set->map, initial_size);`
	`30`	`+ oidmap_init(&set->map, initial_size);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`/**`