X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=commit-tree.c;h=1d125b8412f0eff6576e8c91343bbf8d9726247d;hb=000182eacf99cde27d5916aa415921924b82972c;hp=b8dd36f0b8d7b1c49a478b1aae42de5d594897ab;hpb=d19938ab6053e3dad75a68a60ef8cad1f378b0e5;p=git.git diff --git a/commit-tree.c b/commit-tree.c index b8dd36f0..1d125b84 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -7,9 +7,7 @@ #include #include -#include #include -#include #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 [-p ]* < changelog"; +static char *commit_tree_usage = "git-commit-tree [-p ]* < 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; @@ -153,6 +151,9 @@ int main(int argc, char **argv) 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);