about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-12-02 22:28:37 +0100
committerLars Hjemli2007-12-02 22:28:37 +0100
commitdabb34af760eff2a6ab8e14927fd173cafb77547 (patch)
tree07dd9ce8f00e2a1483fce31de263165fa9545a1c
parentAdd cell-spacing in html (diff)
parentHandle missing timestamp in commit/tag objects (diff)
downloadcgit-dabb34af760eff2a6ab8e14927fd173cafb77547.tar.gz
cgit-dabb34af760eff2a6ab8e14927fd173cafb77547.zip
Merge branch 'stable'
* stable:
  Handle missing timestamp in commit/tag objects
  Set commit date on snapshot contents
-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 e8c7ab9..5093b8b 100644 --- a/parsing.c +++ b/parsing.c
@@ -219,7 +219,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
219 p = t; 219 p = t;
220 t = strchr(t, '>') + 1; 220 t = strchr(t, '>') + 1;
221 ret->author_email = substr(p, t); 221 ret->author_email = substr(p, t);
222 ret->author_date = atol(++t); 222 ret->author_date = atol(t+1);
223 p = strchr(t, '\n') + 1; 223 p = strchr(t, '\n') + 1;
224 } 224 }
225 225
@@ -230,7 +230,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
230 p = t; 230 p = t;
231 t = strchr(t, '>') + 1; 231 t = strchr(t, '>') + 1;
232 ret->committer_email = substr(p, t); 232 ret->committer_email = substr(p, t);
233 ret->committer_date = atol(++t); 233 ret->committer_date = atol(t+1);
234 p = strchr(t, '\n') + 1; 234 p = strchr(t, '\n') + 1;
235 } 235 }
236 236
@@ -315,7 +315,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
315 p = t; 315 p = t;
316 t = strchr(t, '>') + 1; 316 t = strchr(t, '>') + 1;
317 ret->tagger_email = substr(p, t); 317 ret->tagger_email = substr(p, t);
318 ret->tagger_date = atol(++t); 318 ret->tagger_date = atol(t+1);
319 } 319 }
320 p = strchr(p, '\n') + 1; 320 p = strchr(p, '\n') + 1;
321 } 321 }
diff --git a/ui-shared.c b/ui-shared.c index be2c75d..3e13c86 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