summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 36419c8)
raw | patch | inline | side by side (parent: 36419c8)
author | Kjetil Barvik <barvik@broadpark.no> | |
Thu, 19 Feb 2009 20:08:28 +0000 (21:08 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 20 Feb 2009 05:27:14 +0000 (21:27 -0800) |
'struct cache' does not have a 'usec' member, but a 'unsigned int
nsec' member. Simmilar 'struct stat' does not have a 'st_mtim.usec'
member, and we should instead use 'st_mtim.tv_nsec'.
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
nsec' member. Simmilar 'struct stat' does not have a 'st_mtim.usec'
member, and we should instead use 'st_mtim.tv_nsec'.
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-fetch-pack.c | patch | blob | history |
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 67fb80ec48d6d8f0327628afd86fb366d8f97617..3b210c7fdfd0e5a75e5627099fc8fa183b8c0269 100644 (file)
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
mtime.sec = st.st_mtime;
#ifdef USE_NSEC
- mtime.usec = st.st_mtim.usec;
+ mtime.nsec = st.st_mtim.tv_nsec;
#endif
if (stat(shallow, &st)) {
if (mtime.sec)
die("shallow file was removed during fetch");
} else if (st.st_mtime != mtime.sec
#ifdef USE_NSEC
- || st.st_mtim.usec != mtime.usec
+ || st.st_mtim.tv_nsec != mtime.nsec
#endif
)
die("shallow file was changed during fetch");