From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Jul 2014 17:59:24 +0000 (-0700)
Subject: Merge branch 'jk/alloc-commit-id'
X-Git-Tag: v2.1.0-rc0~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/10b944b37b11d6e0597541efdd1fa23c0eecbeff

Merge branch 'jk/alloc-commit-id'

Make sure all in-core commit objects are assigned a unique number
so that they can be annotated using the commit-slab API.

* jk/alloc-commit-id:
diff-tree: avoid lookup_unknown_object
object_as_type: set commit index
alloc: factor out commit index
add object_as_type helper for casting objects
parse_object_buffer: do not set object type
move setting of object->type to alloc_* functions
alloc: write out allocator definitions
alloc.c: remove the alloc_raw_commit_node() function
---

10b944b37b11d6e0597541efdd1fa23c0eecbeff
diff --cc cache.h
index 8ae30d5a85,42a5e865b5..fcb511db70
--- a/cache.h
+++ b/cache.h
@@@ -1402,8 -1376,19 +1402,9 @@@ extern void *alloc_commit_node(void)
  extern void *alloc_tag_node(void);
  extern void *alloc_object_node(void);
  extern void alloc_report(void);
+ extern unsigned int alloc_commit_index(void);
  
 -/* trace.c */
 -__attribute__((format (printf, 1, 2)))
 -extern void trace_printf(const char *format, ...);
 -__attribute__((format (printf, 2, 3)))
 -extern void trace_argv_printf(const char **argv, const char *format, ...);
 -extern void trace_repo_setup(const char *prefix);
 -extern int trace_want(const char *key);
 -__attribute__((format (printf, 2, 3)))
 -extern void trace_printf_key(const char *key, const char *fmt, ...);
 -extern void trace_strbuf(const char *key, const struct strbuf *buf);
 -
 +/* pkt-line.c */
  void packet_trace_identity(const char *prog);
  
  /* add */