Merge branch 'jc/pack'

diff --git a/cache.h b/cache.h
index c7e00e7b0528d640af9e70a2d84455e7cf727993..493983cbaef90cb845d0660dce19072b6ec0b353 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -592,7 +592,9 @@ extern void trace_argv_printf(const char **argv, int count, const char *format,
 /* convert.c */
 extern char *convert_to_git(const char *path, const char *src, unsigned long *sizep);
 extern char *convert_to_working_tree(const char *path, const char *src, unsigned long *sizep);
-extern void *convert_sha1_file(const char *path, const unsigned char *sha1, unsigned int mode, enum object_type *type, unsigned long *size);
+
+/* diff.c */
+extern int diff_auto_refresh_index;
 
 /* match-trees.c */
 void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);