Merge with master.

diff --git a/tar-tree.c b/tar-tree.c
index 673ac66ed6fd37eeeaa8580b2e43f0e2cee91a16..a877fe545e74511a905f803564e51158da68d0d1 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -17,7 +17,7 @@
 #define EXT_HEADER_PATH                1
 #define EXT_HEADER_LINKPATH    2
 
-static const char *tar_tree_usage = "git-tar-tree <key> [basedir]";
+static const char tar_tree_usage[] = "git-tar-tree <key> [basedir]";
 
 static char block[BLOCKSIZE];
 static unsigned long offset;