[PATCH] diff-tree usage

[git.git] / commit-tree.c

diff --git a/commit-tree.c b/commit-tree.c
index 0d7852f..ac431fe 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -41,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;
        }
@@ -111,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;
@@ -134,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);
@@ -143,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);
@@ -172,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;
 }