From 5b75064a81f9fe8f8a446a4be050fe3dfcf52b89 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 11 Nov 2007 13:14:15 +0100 Subject: Set commit date on snapshot contents The testsuite revealed that cgit snapshots don't set any useful timestamp on the files contained in the snapshot. Cherry-picked-from: 2ff33a8a0405b420cd75e0e207c7efeecd6f130b Signed-off-by: Lars Hjemli --- ui-snapshot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ui-snapshot.c b/ui-snapshot.c index bd34a28..4d1aa88 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -99,6 +99,7 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, memset(&args,0,sizeof(args)); args.base = fmt("%s/", prefix); args.tree = commit->tree; + args.time = commit->date; cgit_print_snapshot_start(sat->mimetype, filename, item); (*sat->write_func)(&args); return; -- cgit 1.4.1 From fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 2 Dec 2007 22:11:35 +0100 Subject: Handle missing timestamp in commit/tag objects When a commit or tag lacks author/committer/tagger timestamp, do not skip the next line in the commit/tag object. Also, do not bother to print timestamps with value 0 as it is close to certain to be bogus. Signed-off-by: Lars Hjemli --- parsing.c | 6 +++--- ui-shared.c | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/parsing.c b/parsing.c index 30e7648..55a485d 100644 --- a/parsing.c +++ b/parsing.c @@ -218,7 +218,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) p = t; t = strchr(t, '>') + 1; ret->author_email = substr(p, t); - ret->author_date = atol(++t); + ret->author_date = atol(t+1); p = strchr(t, '\n') + 1; } @@ -229,7 +229,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) p = t; t = strchr(t, '>') + 1; ret->committer_email = substr(p, t); - ret->committer_date = atol(++t); + ret->committer_date = atol(t+1); p = strchr(t, '\n') + 1; } @@ -290,7 +290,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag) p = t; t = strchr(t, '>') + 1; ret->tagger_email = substr(p, t); - ret->tagger_date = atol(++t); + ret->tagger_date = atol(t+1); } p = strchr(p, '\n') + 1; } diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..4944dfd2 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -304,6 +304,8 @@ void cgit_print_date(time_t secs, char *format) char buf[64]; struct tm *time; + if (!secs) + return; time = gmtime(&secs); strftime(buf, sizeof(buf)-1, format, time); html_txt(buf); @@ -313,6 +315,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format) { time_t now, secs; + if (!t) + return; time(&now); secs = now - t; -- cgit 1.4.1