X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=commit-tree.c;h=0d504e7e4be10083da6e677bbcb95bc186fc6277;hb=4397f0148ad0967cf3a2d794fb3d6b2c7f8738d7;hp=23de13361944ad7ba7c5320cf7cdd04e81842c60;hpb=812666c8e66a21e668c0789d0422aa5a7db54961;p=git.git diff --git a/commit-tree.c b/commit-tree.c index 23de1336..0d504e7e 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -7,9 +7,7 @@ #include #include -#include #include -#include #define BLOCKING (1ul << 14) @@ -80,148 +78,6 @@ static void remove_special(char *p) } } -static const char *month_names[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" -}; - -static const char *weekday_names[] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -}; - - -static char *skipfws(char *str) -{ - while (isspace(*str)) - str++; - return str; -} - - -/* 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_rfc2822_date(char *date, char *result, int maxlen) -{ - struct tm tm; - char *p; - int i, offset; - time_t then; - - memset(&tm, 0, sizeof(tm)); - - /* Skip day-name */ - p = skipfws(date); - if (!isdigit(*p)) { - for (i=0; i<7; i++) { - if (!strncmp(p,weekday_names[i],3) && p[3] == ',') { - p = skipfws(p+4); - goto day; - } - } - return; - } - - /* day */ - day: - tm.tm_mday = strtoul(p, &p, 10); - - if (tm.tm_mday < 1 || tm.tm_mday > 31) - return; - - if (!isspace(*p)) - return; - - p = skipfws(p); - - /* month */ - - for (i=0; i<12; i++) { - if (!strncmp(p, month_names[i], 3) && isspace(p[3])) { - tm.tm_mon = i; - p = skipfws(p+strlen(month_names[i])); - goto year; - } - } - return; /* Error -- bad month */ - - /* year */ - year: - tm.tm_year = strtoul(p, &p, 10); - - if (!tm.tm_year && !isspace(*p)) - return; - - if (tm.tm_year > 1900) - tm.tm_year -= 1900; - - p=skipfws(p); - - /* hour */ - if (!isdigit(*p)) - return; - tm.tm_hour = strtoul(p, &p, 10); - - if (!tm.tm_hour > 23) - return; - - if (*p != ':') - return; /* Error -- bad time */ - p++; - - /* minute */ - if (!isdigit(*p)) - return; - tm.tm_min = strtoul(p, &p, 10); - - if (!tm.tm_min > 59) - return; - - if (isspace(*p)) - goto zone; - - if (*p != ':') - return; /* Error -- bad time */ - p++; - - /* second */ - if (!isdigit(*p)) - return; - tm.tm_sec = strtoul(p, &p, 10); - - if (!tm.tm_sec > 59) - return; - - if (!isspace(*p)) - return; - - zone: - p = skipfws(p); - - if (*p == '-') - offset = -60; - else if (*p == '+') - offset = 60; - else - return; - - if (!isdigit(p[1]) || !isdigit(p[2]) || !isdigit(p[3]) || !isdigit(p[4])) - return; - - i = strtoul(p+1, NULL, 10); - offset *= ((i % 100) + ((i / 100) * 60)); - - if (*(skipfws(p + 5))) - return; - - then = mktime(&tm); /* mktime appears to ignore the GMT offset, stupidly */ - if (then == -1) - return; - - then -= offset; - - snprintf(result, maxlen, "%lu %5.5s", then, p); -} - static void check_valid(unsigned char *sha1, const char *expect) { void *buf; @@ -239,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 = "commit-tree [-p ]* < changelog"; +static char *commit_tree_usage = "git-commit-tree [-p ]* < 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; @@ -267,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]); @@ -286,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_rfc2822_date(audate, 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);