Merge branch 'nd/worktree-move'

diff --git a/cache.h b/cache.h
index 21fbcc2414953d00929185aeb97f3a6ae9a3f73a..d06932ed0bd049c8d41906da3508725c8978aa1c 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1661,7 +1661,7 @@ struct pack_entry {
  * usual "XXXXXX" trailer, and the resulting filename is written into the
  * "template" buffer. Returns the open descriptor.
  */
-extern int odb_mkstemp(struct strbuf *template, const char *pattern);
+extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
 
 /*
  * Create a pack .keep file named "name" (which should generally be the output
@@ -1732,7 +1732,7 @@ struct object_info {
        unsigned long *sizep;
        off_t *disk_sizep;
        unsigned char *delta_base_sha1;
-       struct strbuf *typename;
+       struct strbuf *type_name;
        void **contentp;
 
        /* Response */