X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=commit-tree.c;h=ea0fdd44e2865e63c6e4750345a30c42e699cf66;hb=4bfe1199eabb41eb1f1d67f4ee24df028eb21300;hp=d545f62aaa48f2fb9f3aff5fd422c7ab32d94c62;hpb=07ee0d77c66d6f356cd3f82435e67510779aa53c;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index d545f62a..ea0fdd44 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -7,7 +7,6 @@
 
 #include <pwd.h>
 #include <time.h>
-#include <ctype.h>
 
 #define BLOCKING (1ul << 14)
 
@@ -64,7 +63,7 @@ static void check_valid(unsigned char *sha1, const char *expect)
 #define MAXPARENT (16)
 static unsigned char parent_sha1[MAXPARENT][20];
 
-static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
+static const char commit_tree_usage[] = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
 
 static int new_parent(int idx)
 {
@@ -89,6 +88,9 @@ int main(int argc, char **argv)
 	char *buffer;
 	unsigned int size;
 
+	setup_ident();
+	git_config(git_default_config);
+
 	if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
 		usage(commit_tree_usage);
 
@@ -104,7 +106,6 @@ int main(int argc, char **argv)
 	}
 	if (!parents)
 		fprintf(stderr, "Committing initial tree %s\n", argv[1]);
-	setup_ident();
 
 	init_buffer(&buffer, &size);
 	add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));