about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-12-02 22:11:35 +0100
committerLars Hjemli2007-12-02 22:27:07 +0100
commitfc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (patch)
treeb45ed1a2e08360977df3c4a7c1dc5af32dae2751
parentSet commit date on snapshot contents (diff)
downloadcgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar.gz
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.zip
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 <hjemli@gmail.com>
-rw-r--r--parsing.c6
-rw-r--r--ui-shared.c4
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)
218 p = t; 218 p = t;
219 t = strchr(t, '>') + 1; 219 t = strchr(t, '>') + 1;
220 ret->author_email = substr(p, t); 220 ret->author_email = substr(p, t);
221 ret->author_date = atol(++t); 221 ret->author_date = atol(t+1);
222 p = strchr(t, '\n') + 1; 222 p = strchr(t, '\n') + 1;
223 } 223 }
224 224
@@ -229,7 +229,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
229 p = t; 229 p = t;
230 t = strchr(t, '>') + 1; 230 t = strchr(t, '>') + 1;
231 ret->committer_email = substr(p, t); 231 ret->committer_email = substr(p, t);
232 ret->committer_date = atol(++t); 232 ret->committer_date = atol(t+1);
233 p = strchr(t, '\n') + 1; 233 p = strchr(t, '\n') + 1;
234 } 234 }
235 235
@@ -290,7 +290,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
290 p = t; 290 p = t;
291 t = strchr(t, '>') + 1; 291 t = strchr(t, '>') + 1;
292 ret->tagger_email = substr(p, t); 292 ret->tagger_email = substr(p, t);
293 ret->tagger_date = atol(++t); 293 ret->tagger_date = atol(t+1);
294 } 294 }
295 p = strchr(p, '\n') + 1; 295 p = strchr(p, '\n') + 1;
296 } 296 }
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)
304 char buf[64]; 304 char buf[64];
305 struct tm *time; 305 struct tm *time;
306 306
307 if (!secs)
308 return;
307 time = gmtime(&secs); 309 time = gmtime(&secs);
308 strftime(buf, sizeof(buf)-1, format, time); 310 strftime(buf, sizeof(buf)-1, format, time);
309 html_txt(buf); 311 html_txt(buf);
@@ -313,6 +315,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
313{ 315{
314 time_t now, secs; 316 time_t now, secs;
315 317
318 if (!t)
319 return;
316 time(&now); 320 time(&now);
317 secs = now - t; 321 secs = now - t;
318 322