Merge branch 'gb/maint-submodule-env' into maint

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 58209adbd6f0c7e72b1e29c36af31c82e842c9ac..6e54993256befed7b77fc54559ff196d01292ef2 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -650,6 +650,10 @@ int git_mkstemp(char *path, size_t n, const char *template);
 
 int git_mkstemps(char *path, size_t n, const char *template, int suffix_len);
 
+/* set default permissions by passing mode arguments to open(2) */
+int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
+int git_mkstemp_mode(char *pattern, int mode);
+
 /*
  * NOTE NOTE NOTE!!
  *
@@ -784,7 +788,7 @@ extern const char *git_committer_info(int);
 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
 extern const char *fmt_name(const char *name, const char *email);
 extern const char *git_editor(void);
-extern const char *git_pager(void);
+extern const char *git_pager(int stdout_is_tty);
 
 struct checkout {
        const char *base_dir;