X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;h=16c17871334601b0b3c211cbedd8e8291af261a3;hb=7b0c996679e975b666fd27c922e1e0837b611c98;hp=ea0fdd44e2865e63c6e4750345a30c42e699cf66;hpb=f865a2ad981f72423aa1c19412ce57c543801957;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index ea0fdd44..16c17871 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -5,9 +5,6 @@
  */
 #include "cache.h"
 
-#include <pwd.h>
-#include <time.h>
-
 #define BLOCKING (1ul << 14)
 
 /*
@@ -89,6 +86,8 @@ int main(int argc, char **argv)
 	unsigned int size;
 
 	setup_ident();
+	setup_git_directory();
+
 	git_config(git_default_config);
 
 	if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
@@ -119,14 +118,17 @@ int main(int argc, char **argv)
 		add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i]));
 
 	/* Person/date information */
-	add_buffer(&buffer, &size, "author %s\n", git_author_info());
-	add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info());
+	add_buffer(&buffer, &size, "author %s\n", git_author_info(1));
+	add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1));
 
 	/* And add the comment */
 	while (fgets(comment, sizeof(comment), stdin) != NULL)
 		add_buffer(&buffer, &size, "%s", comment);
 
-	write_sha1_file(buffer, size, "commit", commit_sha1);
-	printf("%s\n", sha1_to_hex(commit_sha1));
-	return 0;
+	if (!write_sha1_file(buffer, size, "commit", commit_sha1)) {
+		printf("%s\n", sha1_to_hex(commit_sha1));
+		return 0;
+	}
+	else
+		return 1;
 }