From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Mar 2007 09:08:48 +0000 (-0700)
Subject: Merge branch 'jc/repack'
X-Git-Tag: v1.5.1-rc1~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c49b260e99d3e0fdd5d84615091ebb969adef5b2?ds=inline;hp=-c

Merge branch 'jc/repack'

* jc/repack:
prepare_packed_git(): sort packs by age and localness.
---

c49b260e99d3e0fdd5d84615091ebb969adef5b2
diff --combined cache.h
index faed2a8994,75da344fdc..a4762eda5c
--- a/cache.h
+++ b/cache.h
@@@ -372,6 -372,7 +372,7 @@@ extern struct packed_git 
  	struct packed_git *next;
  	struct pack_window *windows;
  	uint32_t *index_base;
+ 	time_t mtime;
  	off_t index_size;
  	off_t pack_size;
  	int pack_fd;
@@@ -480,7 -481,6 +481,7 @@@ extern struct tag *alloc_tag_node(void)
  extern void alloc_report(void);
  
  /* trace.c */
 +extern int nfasprintf(char **str, const char *fmt, ...);
  extern int nfvasprintf(char **str, const char *fmt, va_list va);
  extern void trace_printf(const char *format, ...);
  extern void trace_argv_printf(const char **argv, int count, const char *format, ...);