aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-12-02 21:28:37 +0000
committerLars Hjemli <hjemli@gmail.com>2007-12-02 21:28:37 +0000
commitdabb34af760eff2a6ab8e14927fd173cafb77547 (patch)
tree07dd9ce8f00e2a1483fce31de263165fa9545a1c
parente8e6721817c983770fc0fdfbb26a17900e3c34ce (diff)
parentfc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (diff)
downloadcgit-dabb34af760eff2a6ab8e14927fd173cafb77547.tar
cgit-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)
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;
}
@@ -230,7 +230,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;
}
@@ -315,7 +315,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 be2c75d..3e13c86 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;