Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1

diff --git a/git-compat-util.h b/git-compat-util.h
index e20b1e858cc715d1840da11c6198a1d6e6bec2a4..124bb94b153f13e4be5e17814b67115ff31d1587 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -303,6 +303,8 @@ extern ssize_t xwrite(int fd, const void *buf, size_t len);
 extern int xdup(int fd);
 extern FILE *xfdopen(int fd, const char *mode);
 extern int xmkstemp(char *template);
+extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
+extern int odb_pack_keep(char *name, size_t namesz, unsigned char *sha1);
 
 static inline size_t xsize_t(off_t len)
 {