зеркало из https://github.com/microsoft/git.git
fix compile error when USE_NSEC is defined
'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>
This commit is contained in:
Родитель
36419c8ee4
Коммит
8cd6192e16
|
@ -802,14 +802,14 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args,
|
||||||
|
|
||||||
mtime.sec = st.st_mtime;
|
mtime.sec = st.st_mtime;
|
||||||
#ifdef USE_NSEC
|
#ifdef USE_NSEC
|
||||||
mtime.usec = st.st_mtim.usec;
|
mtime.nsec = st.st_mtim.tv_nsec;
|
||||||
#endif
|
#endif
|
||||||
if (stat(shallow, &st)) {
|
if (stat(shallow, &st)) {
|
||||||
if (mtime.sec)
|
if (mtime.sec)
|
||||||
die("shallow file was removed during fetch");
|
die("shallow file was removed during fetch");
|
||||||
} else if (st.st_mtime != mtime.sec
|
} else if (st.st_mtime != mtime.sec
|
||||||
#ifdef USE_NSEC
|
#ifdef USE_NSEC
|
||||||
|| st.st_mtim.usec != mtime.usec
|
|| st.st_mtim.tv_nsec != mtime.nsec
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
die("shallow file was changed during fetch");
|
die("shallow file was changed during fetch");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче