git-pack-objects: mark the delta packing with a 'D'.

diff --git a/commit-tree.c b/commit-tree.c
index 7c23b9b506bc50521a053d20e8960f857f1ae31a..0d504e7e4be10083da6e677bbcb95bc186fc6277 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -7,10 +7,7 @@
 
 #include <pwd.h>
 #include <time.h>
-#include <string.h>
 #include <ctype.h>
-#include <time.h>
-#include <curl/curl.h>
 
 #define BLOCKING (1ul << 14)
 
@@ -81,24 +78,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;
@@ -116,24 +95,35 @@ static void check_valid(unsigned char *sha1, const char *expect)
  * how multi-way merges are represented.
  */
 #define MAXPARENT (16)
+static unsigned char parent_sha1[MAXPARENT][20];
+
+static char *commit_tree_usage = "git-commit-tree <sha1> [-p <sha1>]* < changelog";
 
-static char *commit_tree_usage = "commit-tree <sha1> [-p <sha1>]* < changelog";
+static int new_parent(int idx)
+{
+       int i;
+       unsigned char *sha1 = parent_sha1[idx];
+       for (i = 0; i < idx; i++) {
+               if (!memcmp(parent_sha1[i], sha1, 20)) {
+                       error("duplicate parent %s ignored", sha1_to_hex(sha1));
+                       return 0;
+               }
+       }
+       return 1;
+}
 
 int main(int argc, char **argv)
 {
        int i, len;
        int parents = 0;
        unsigned char tree_sha1[20];
-       unsigned char parent_sha1[MAXPARENT][20];
        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;
-       time_t now;
-       struct tm *tm;
        char *buffer;
        unsigned int size;
 
@@ -144,10 +134,11 @@ 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++;
+               if (new_parent(parents))
+                       parents++;
        }
        if (!parents)
                fprintf(stderr, "Committing initial tree %s\n", argv[1]);
@@ -163,19 +154,20 @@ 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;
-       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, &now, date, sizeof(date));
+               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);