[PATCH] diff-raw format update take #2.

diff --git a/commit-tree.c b/commit-tree.c
index cfd6730fe8da68a9b4e10ccf6481a2a1264fc81d..e81e530fd4d5a118f814754455d36d83649b3124 100644 (file)
--- 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)
 {
@@ -146,11 +144,11 @@ 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));