X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=commit-tree.c;h=ac431febe9052109d52bfa556ee04b2ef7715f01;hb=aebb2679085d2ecc4d1c943ecfb2e87c699f00d0;hp=840307af0cfaab31555795ce7175d5e9c9f981a0;hpb=e83c5163316f89bfbde7d9ab23ca2e25604af290;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index 840307af..ac431feb 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -1,3 +1,8 @@
+/*
+ * GIT - The information manager from hell
+ *
+ * Copyright (C) Linus Torvalds, 2005
+ */
 #include "cache.h"
 
 #include <pwd.h>
@@ -36,7 +41,7 @@ static void add_buffer(char **bufp, unsigned int *sizep, const char *fmt, ...)
 	alloc = (size + 32767) & ~32767;
 	buf = *bufp;
 	if (newsize > alloc) {
-		alloc = (newsize + 32767) & ~32767;   
+		alloc = (newsize + 32767) & ~32767;
 		buf = realloc(buf, alloc);
 		*bufp = buf;
 	}
@@ -106,6 +111,7 @@ int main(int argc, char **argv)
 	int parents = 0;
 	unsigned char tree_sha1[20];
 	unsigned char parent_sha1[MAXPARENT][20];
+	unsigned char commit_sha1[20];
 	char *gecos, *realgecos;
 	char *email, realemail[1000];
 	char *date, *realdate;
@@ -129,7 +135,7 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Committing initial tree %s\n", argv[1]);
 	pw = getpwuid(getuid());
 	if (!pw)
-		usage("You don't exist. Go away!");
+		die("You don't exist. Go away!");
 	realgecos = pw->pw_gecos;
 	len = strlen(pw->pw_name);
 	memcpy(realemail, pw->pw_name, len);
@@ -138,9 +144,9 @@ int main(int argc, char **argv)
 	time(&now);
 	realdate = ctime(&now);
 
-	gecos = getenv("COMMITTER_NAME") ? : realgecos;
-	email = getenv("COMMITTER_EMAIL") ? : realemail;
-	date = getenv("COMMITTER_DATE") ? : realdate;
+	gecos = getenv("AUTHOR_NAME") ? : realgecos;
+	email = getenv("AUTHOR_EMAIL") ? : realemail;
+	date = getenv("AUTHOR_DATE") ? : realdate;
 
 	remove_special(gecos); remove_special(realgecos);
 	remove_special(email); remove_special(realemail);
@@ -167,6 +173,7 @@ int main(int argc, char **argv)
 
 	finish_buffer("commit ", &buffer, &size);
 
-	write_sha1_file(buffer, size);
+	write_sha1_file(buffer, size, commit_sha1);
+	printf("%s\n", sha1_to_hex(commit_sha1));
 	return 0;
 }