Merge branch 'maint'

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 69e167b16c284534d84019ba0f781fe2c3a889dd..61e75eb60c992e38ddf195abad564a76cbf934cb 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -14,7 +14,7 @@
 static int line_termination = '\n';
 static int checkout_stage; /* default to checkout stage0 */
 static int to_tempfile;
-static char topath[4][PATH_MAX + 1];
+static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
 
 static struct checkout state;