Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git notes merge: Handle real, non-conflicting notes merges
[gitweb.git]
/
date.c
diff --git
a/date.c
b/date.c
index 68cdcaa3f6268855539fcae02c8e87b965204b4d..3c981f7eb5ebaed1ba621f3d4cd960f14145b97a 100644
(file)
--- a/
date.c
+++ b/
date.c
@@
-635,7
+635,7
@@
int parse_date_toffset(const char *date, unsigned long *timestamp, int *offset)
/* mktime uses local timezone */
*timestamp = tm_to_time_t(&tm);
if (*offset == -1)
- *offset = (*timestamp - mktime(&tm)) / 60;
+ *offset = (
(time_t)
*timestamp - mktime(&tm)) / 60;
if (*timestamp == -1)
return -1;