[PATCH] Fix broken diff-cache output on added files

[git.git] / commit-tree.c

diff --git a/commit-tree.c b/commit-tree.c
index b209575..c0b07f8 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -83,11 +83,11 @@ static void finish_buffer(char *tag, char **bufp, unsigned int *sizep)
 static void remove_special(char *p)
 {
        char c;
-       char *dst = p;
+       char *dst = p, *src = p;
 
        for (;;) {
-               c = *p;
-               p++;
+               c = *src;
+               src++;
                switch(c) {
                case '\n': case '<': case '>':
                        continue;
@@ -96,6 +96,21 @@ static void remove_special(char *p)
                if (!c)
                        break;
        }
+
+       /*
+        * Go back, and remove crud from the end: some people
+        * have commas etc in their gecos field
+        */
+       dst--;
+       while (--dst >= p) {
+               unsigned char c = *dst;
+               switch (c) {
+               case ',': case ';': case '.':
+                       *dst = 0;
+                       continue;
+               }
+               break;
+       }
 }
 
 static const char *month_names[] = {
@@ -253,15 +268,13 @@ static void check_valid(unsigned char *sha1, const char *expect)
 }
 
 /*
- * Having more than two parents may be strange, but hey, there's
- * no conceptual reason why the file format couldn't accept multi-way
- * merges. It might be the "union" of several packages, for example.
- *
- * I don't really expect that to happen, but this is here to make
- * it clear that _conceptually_ it's ok..
+ * Having more than two parents is not strange at all, and this is
+ * how multi-way merges are represented.
  */
 #define MAXPARENT (16)
 
+static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
+
 int main(int argc, char **argv)
 {
        int i, len;
@@ -269,8 +282,8 @@ int main(int argc, char **argv)
        unsigned char tree_sha1[20];
        unsigned char parent_sha1[MAXPARENT][20];
        unsigned char commit_sha1[20];
-       char *gecos, *realgecos;
-       char *email, realemail[1000];
+       char *gecos, *realgecos, *commitgecos;
+       char *email, *commitemail, realemail[1000];
        char date[20], realdate[20];
        char *audate;
        char comment[1000];
@@ -281,14 +294,14 @@ int main(int argc, char **argv)
        unsigned int size;
 
        if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
-               usage("commit-tree <sha1> [-p <sha1>]* < changelog");
+               usage(commit_tree_usage);
 
        check_valid(tree_sha1, "tree");
        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]))
-                       usage("commit-tree <sha1> [-p <sha1>]* < changelog");
+                       usage(commit_tree_usage);
                check_valid(parent_sha1[parents], "commit");
                parents++;
        }
@@ -302,20 +315,26 @@ int main(int argc, char **argv)
        memcpy(realemail, pw->pw_name, len);
        realemail[len] = '@';
        gethostname(realemail+len+1, sizeof(realemail)-len-1);
+       if (!strchr(realemail+len+1, '.')) {
+               strcat(realemail, ".");
+               getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1);
+       }
        time(&now);
        tm = localtime(&now);
 
        strftime(realdate, sizeof(realdate), "%s %z", tm);
        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");
        if (audate)
                parse_rfc2822_date(audate, date, sizeof(date));
 
-       remove_special(gecos); remove_special(realgecos);
-       remove_special(email); remove_special(realemail);
+       remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
+       remove_special(email); remove_special(realemail); remove_special(commitemail);
 
        init_buffer(&buffer, &size);
        add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));
@@ -330,7 +349,7 @@ int main(int argc, char **argv)
 
        /* Person/date information */
        add_buffer(&buffer, &size, "author %s <%s> %s\n", gecos, email, date);
-       add_buffer(&buffer, &size, "committer %s <%s> %s\n\n", realgecos, realemail, realdate);
+       add_buffer(&buffer, &size, "committer %s <%s> %s\n\n", commitgecos, commitemail, realdate);
 
        /* And add the comment */
        while (fgets(comment, sizeof(comment), stdin) != NULL)