Merge branch 'fixes'

diff --git a/path.c b/path.c
index 7ef0d1b80d926d832816a587ddff721cb03130b3..495d17ca4ca371f4b5bdb6f1f3de9a6a9d84280b 100644 (file)
--- a/path.c
+++ b/path.c
@@ -41,7 +41,7 @@ char *mkpath(const char *fmt, ...)
 
 char *git_path(const char *fmt, ...)
 {
-       const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
+       const char *git_dir = get_git_dir();
        va_list args;
        unsigned len;
 
@@ -68,8 +68,13 @@ int git_mkstemp(char *path, size_t len, const char *template)
        if ((env = getenv("TMPDIR")) == NULL) {
                strcpy(pch, "/tmp/");
                len -= 5;
-       } else
-               len -= snprintf(pch, len, "%s/", env);
+               pch += 5;
+       } else {
+               size_t n = snprintf(pch, len, "%s/", env);
+
+               len -= n;
+               pch += n;
+       }
 
        safe_strncpy(pch, template, len);