Merge branch 'jc/bs-t-is-not-a-tab-for-sed'

diff --git a/cache.h b/cache.h
index 5c8078291c478f579d6b8bcc69417ac6adb1ced0..556468c25b8c3a06eb776fbf322bed805ec97c33 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1675,9 +1675,12 @@ extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
 extern void pack_report(void);
 
 /*
- * Create a temporary file rooted in the object database directory.
+ * Create a temporary file rooted in the object database directory, or
+ * die on failure. The filename is taken from "pattern", which should have the
+ * usual "XXXXXX" trailer, and the resulting filename is written into the
+ * "template" buffer. Returns the open descriptor.
  */
-extern int odb_mkstemp(char *template, size_t limit, const char *pattern);
+extern int odb_mkstemp(struct strbuf *template, const char *pattern);
 
 /*
  * Generate the filename to be used for a pack file with checksum "sha1" and