git-apply: parse the whole list of patches into memory first

diff --git a/commit-tree.c b/commit-tree.c
index cfd6730fe8da68a9b4e10ccf6481a2a1264fc81d..e9069971a8bbe413ceb71f63fc48513a475a4d6f 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)
 {
@@ -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;
@@ -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(audate, realdate, sizeof(realdate));
 
        remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
        remove_special(email); remove_special(realemail); remove_special(commitemail);