X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;h=1d125b8412f0eff6576e8c91343bbf8d9726247d;hb=17ebe977d72290dcdc848b78ae2e65b59d4e1b4c;hp=0c568d0179e93bc202ac62c31fca7fe107b3ab1c;hpb=ecee9d9e793c7573cf3730fb9746527a0a7e94e7;p=git.git

diff --git a/commit-tree.c b/commit-tree.c
index 0c568d01..1d125b84 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -7,9 +7,7 @@
 
 #include <pwd.h>
 #include <time.h>
-#include <string.h>
 #include <ctype.h>
-#include <time.h>
 
 #define BLOCKING (1ul << 14)
 
@@ -98,7 +96,7 @@ static void check_valid(unsigned char *sha1, const char *expect)
  */
 #define MAXPARENT (16)
 
-static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
+static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
 
 int main(int argc, char **argv)
 {
@@ -109,8 +107,8 @@ int main(int argc, char **argv)
 	unsigned char commit_sha1[20];
 	char *gecos, *realgecos, *commitgecos;
 	char *email, *commitemail, realemail[1000];
-	char date[20], realdate[20];
-	char *audate;
+	char date[50], realdate[50];
+	char *audate, *cmdate;
 	char comment[1000];
 	struct passwd *pw;
 	char *buffer;
@@ -123,7 +121,7 @@ int main(int argc, char **argv)
 	for (i = 2; i < argc; i += 2) {
 		char *a, *b;
 		a = argv[i]; b = argv[i+1];
-		if (!b || strcmp(a, "-p") || get_sha1_hex(b, parent_sha1[parents]))
+		if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
 			usage(commit_tree_usage);
 		check_valid(parent_sha1[parents], "commit");
 		parents++;
@@ -146,13 +144,16 @@ int main(int argc, char **argv)
 	datestamp(realdate, sizeof(realdate));
 	strcpy(date, realdate);
 
-	commitgecos = getenv("COMMIT_AUTHOR_NAME") ? : realgecos;
-	commitemail = getenv("COMMIT_AUTHOR_EMAIL") ? : realemail;
-	gecos = getenv("AUTHOR_NAME") ? : realgecos;
-	email = getenv("AUTHOR_EMAIL") ? : realemail;
-	audate = getenv("AUTHOR_DATE");
+	commitgecos = gitenv("GIT_COMMITTER_NAME") ? : realgecos;
+	commitemail = gitenv("GIT_COMMITTER_EMAIL") ? : realemail;
+	gecos = gitenv("GIT_AUTHOR_NAME") ? : realgecos;
+	email = gitenv("GIT_AUTHOR_EMAIL") ? : realemail;
+	audate = gitenv("GIT_AUTHOR_DATE");
 	if (audate)
 		parse_date(audate, date, sizeof(date));
+	cmdate = gitenv("GIT_COMMITTER_DATE");
+	if (cmdate)
+		parse_date(cmdate, realdate, sizeof(realdate));
 
 	remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
 	remove_special(email); remove_special(realemail); remove_special(commitemail);