Merge branch 'stable'
* stable: Handle missing timestamp in commit/tag objects Set commit date on snapshot contents
This commit is contained in:
		| @@ -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; | ||||
| 	} | ||||
|   | ||||
| @@ -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; | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Lars Hjemli
					Lars Hjemli