Merge branch 'mt/dir-iterator-updates'

diff --git a/pack-objects.h b/pack-objects.h
index 6fde7ce27cbc15b33a3d994bad87ab140f3164a7..857d43850b6258696d506a23cabd1adc187d8159 100644 (file)
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -187,7 +187,7 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
                                    uint32_t index_pos);
 
 struct object_entry *packlist_find(struct packing_data *pdata,
-                                  const unsigned char *sha1,
+                                  const struct object_id *oid,
                                   uint32_t *index_pos);
 
 static inline uint32_t pack_name_hash(const char *name)