Revision bab748371a104c58058c0eff9f4073b710ce0355 authored by Jeff King on 20 June 2016, 21:14:14 UTC, committed by Junio C Hamano on 20 June 2016, 22:08:07 UTC
When we want to know the local timezone offset at a given timestamp, we compute it by asking for localtime() at the given time, and comparing the offset to GMT at that time. However, there's some juggling between time_t and "struct tm" which happens, which involves calling our own tm_to_time_t(). If that function returns an error (e.g., because it only handles dates up to the year 2099), it returns "-1", which we treat as a time_t, and is clearly bogus, leading to bizarre timestamps (that seem to always adjust the time back to (time_t)(uint32_t)-1, in the year 2106). It's not a good idea for local_tzoffset() to simply die here; it would make it hard to run "git log" on a repository with funny timestamps. Instead, let's just treat such cases as "zero offset". Reported-by: Norbert Kiesel <nkiesel@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 36d6792
csum-file.h
#ifndef CSUM_FILE_H
#define CSUM_FILE_H
struct progress;
/* A SHA1-protected file */
struct sha1file {
int fd;
int check_fd;
unsigned int offset;
git_SHA_CTX ctx;
off_t total;
struct progress *tp;
const char *name;
int do_crc;
uint32_t crc32;
unsigned char buffer[8192];
};
/* Checkpoint */
struct sha1file_checkpoint {
off_t offset;
git_SHA_CTX ctx;
};
extern void sha1file_checkpoint(struct sha1file *, struct sha1file_checkpoint *);
extern int sha1file_truncate(struct sha1file *, struct sha1file_checkpoint *);
/* sha1close flags */
#define CSUM_CLOSE 1
#define CSUM_FSYNC 2
extern struct sha1file *sha1fd(int fd, const char *name);
extern struct sha1file *sha1fd_check(const char *name);
extern struct sha1file *sha1fd_throughput(int fd, const char *name, struct progress *tp);
extern int sha1close(struct sha1file *, unsigned char *, unsigned int);
extern void sha1write(struct sha1file *, const void *, unsigned int);
extern void sha1flush(struct sha1file *f);
extern void crc32_begin(struct sha1file *);
extern uint32_t crc32_end(struct sha1file *);
static inline void sha1write_u8(struct sha1file *f, uint8_t data)
{
sha1write(f, &data, sizeof(data));
}
static inline void sha1write_be32(struct sha1file *f, uint32_t data)
{
data = htonl(data);
sha1write(f, &data, sizeof(data));
}
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...