summaryrefslogtreecommitdiffabout
path: root/parsing.c
authorLars Hjemli <hjemli@gmail.com>2007-12-02 21:28:37 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-12-02 21:28:37 (UTC)
commitdabb34af760eff2a6ab8e14927fd173cafb77547 (patch) (unidiff)
tree07dd9ce8f00e2a1483fce31de263165fa9545a1c /parsing.c
parente8e6721817c983770fc0fdfbb26a17900e3c34ce (diff)
parentfc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (diff)
downloadcgit-dabb34af760eff2a6ab8e14927fd173cafb77547.zip
cgit-dabb34af760eff2a6ab8e14927fd173cafb77547.tar.gz
cgit-dabb34af760eff2a6ab8e14927fd173cafb77547.tar.bz2
Merge branch 'stable'
* stable: Handle missing timestamp in commit/tag objects Set commit date on snapshot contents
Diffstat (limited to 'parsing.c') (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/parsing.c b/parsing.c
index e8c7ab9..5093b8b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -214,28 +214,28 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
214 214
215 if (!strncmp(p, "author ", 7)) { 215 if (!strncmp(p, "author ", 7)) {
216 p += 7; 216 p += 7;
217 t = strchr(p, '<') - 1; 217 t = strchr(p, '<') - 1;
218 ret->author = substr(p, t); 218 ret->author = substr(p, t);
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
226 if (!strncmp(p, "committer ", 9)) { 226 if (!strncmp(p, "committer ", 9)) {
227 p += 9; 227 p += 9;
228 t = strchr(p, '<') - 1; 228 t = strchr(p, '<') - 1;
229 ret->committer = substr(p, t); 229 ret->committer = substr(p, t);
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
237 if (!strncmp(p, "encoding ", 9)) { 237 if (!strncmp(p, "encoding ", 9)) {
238 p += 9; 238 p += 9;
239 t = strchr(p, '\n') + 1; 239 t = strchr(p, '\n') + 1;
240 ret->msg_encoding = substr(p, t); 240 ret->msg_encoding = substr(p, t);
241 p = t; 241 p = t;
@@ -310,17 +310,17 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
310 310
311 if (!strncmp(p, "tagger ", 7)) { 311 if (!strncmp(p, "tagger ", 7)) {
312 p += 7; 312 p += 7;
313 t = strchr(p, '<') - 1; 313 t = strchr(p, '<') - 1;
314 ret->tagger = substr(p, t); 314 ret->tagger = substr(p, t);
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 }
322 322
323 while (p && *p && (*p != '\n')) 323 while (p && *p && (*p != '\n'))
324 p = strchr(p, '\n') + 1; // skip unknown tag fields 324 p = strchr(p, '\n') + 1; // skip unknown tag fields
325 325
326 while (p && (*p == '\n')) 326 while (p && (*p == '\n'))