[PATCH] git-export complains about mising cat-file

diff --git a/commit-tree.c b/commit-tree.c
index 7c23b9b506bc50521a053d20e8960f857f1ae31a..cfd6730fe8da68a9b4e10ccf6481a2a1264fc81d 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -10,7 +10,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#include <curl/curl.h>
 
 #define BLOCKING (1ul << 14)
 
@@ -81,24 +80,6 @@ static void remove_special(char *p)
        }
 }
 
-/* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
-   (i.e. English) day/month names, and it doesn't work correctly with %z. */
-static void parse_date(char *date, time_t *now, char *result, int maxlen)
-{
-       char *p;
-       time_t then;
-
-       if ((then = curl_getdate(date, now)) == 0)
-               return;
-
-       /* find the timezone at the end */
-       p = date + strlen(date);
-       while (p > date && isdigit(*--p))
-               ;
-       if ((*p == '+' || *p == '-') && strlen(p) == 5)
-               snprintf(result, maxlen, "%lu %5.5s", then, p);
-}
-
 static void check_valid(unsigned char *sha1, const char *expect)
 {
        void *buf;
@@ -132,8 +113,6 @@ int main(int argc, char **argv)
        char *audate;
        char comment[1000];
        struct passwd *pw;
-       time_t now;
-       struct tm *tm;
        char *buffer;
        unsigned int size;
 
@@ -144,7 +123,7 @@ int main(int argc, char **argv)
        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]))
+               if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
                        usage(commit_tree_usage);
                check_valid(parent_sha1[parents], "commit");
                parents++;
@@ -163,10 +142,8 @@ int main(int argc, char **argv)
                strcat(realemail, ".");
                getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1);
        }
-       time(&now);
-       tm = localtime(&now);
 
-       strftime(realdate, sizeof(realdate), "%s %z", tm);
+       datestamp(realdate, sizeof(realdate));
        strcpy(date, realdate);
 
        commitgecos = getenv("COMMIT_AUTHOR_NAME") ? : realgecos;
@@ -175,7 +152,7 @@ int main(int argc, char **argv)
        email = getenv("AUTHOR_EMAIL") ? : realemail;
        audate = getenv("AUTHOR_DATE");
        if (audate)
-               parse_date(audate, &now, date, sizeof(date));
+               parse_date(audate, date, sizeof(date));
 
        remove_special(gecos); remove_special(realgecos); remove_special(commitgecos);
        remove_special(email); remove_special(realemail); remove_special(commitemail);