diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-08 13:51:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 14:04:39 -0700 |
| commit | 110c46a909fe27f5b8aff412a78cb821300fb985 (patch) | |
| tree | f9c90dac0a903e6cc4011c0c07c58a7c38fee575 | |
| parent | Record ns-timestamps if possible, but do not use it without USE_NSEC (diff) | |
| download | tgif-110c46a909fe27f5b8aff412a78cb821300fb985.tar.xz | |
Not all systems use st_[cm]tim field for ns resolution file timestamp
Some codepaths do not still use the ST_[CM]TIME_NSEC() pair of macros
introduced by the previous commit but assumes all systems use st_mtim
and st_ctim fields in "struct stat" to record nanosecond resolution part
of the file timestamps.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-fetch-pack.c | 2 | ||||
| -rw-r--r-- | read-cache.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 59b0b0a796..1d7e02326f 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -807,7 +807,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args, die("shallow file was removed during fetch"); } else if (st.st_mtime != mtime.sec #ifdef USE_NSEC - || st.st_mtim.tv_nsec != mtime.nsec + || ST_CTIME_NSEC(st) != mtime.nsec #endif ) die("shallow file was changed during fetch"); diff --git a/read-cache.c b/read-cache.c index b819abbd00..7f74c8d161 100644 --- a/read-cache.c +++ b/read-cache.c @@ -204,9 +204,9 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) changed |= CTIME_CHANGED; #ifdef USE_NSEC - if (ce->ce_mtime.nsec != (unsigned int)st->st_mtim.tv_nsec) + if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st)) changed |= MTIME_CHANGED; - if (trust_ctime && ce->ce_ctime.nsec != (unsigned int)st->st_ctim.tv_nsec) + if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st)) changed |= CTIME_CHANGED; #endif |