summaryrefslogtreecommitdiff
path: root/builtin-fetch-pack.c
diff options
context:
space:
mode:
authorKjetil Barvik <barvik@broadpark.no>2009-03-15 12:38:55 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-15 12:56:40 -0700
commit5bcf109cdf7f7b676600883be8dc7dbf26ddb055 (patch)
tree4478f5104d7a28462cfccb6c29edbfd63b7a56e2 /builtin-fetch-pack.c
parentd7371a2d4d308d961d22c12ae9bc3d28cf35f029 (diff)
downloadgit-5bcf109cdf7f7b676600883be8dc7dbf26ddb055.tar.gz
checkout bugfix: use stat.mtime instead of stat.ctime in two places
Commit e1afca4fd "write_index(): update index_state->timestamp after flushing to disk" on 2009-02-23 used stat.ctime to record the timestamp of the index-file. This is wrong, so fix this and use the correct stat.mtime timestamp instead. Commit 110c46a909 "Not all systems use st_[cm]tim field for ns resolution file timestamp" on 2009-03-08, has a similar bug for the builtin-fetch-pack.c file. Signed-off-by: Kjetil Barvik <barvik@broadpark.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-fetch-pack.c')
-rw-r--r--builtin-fetch-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 1d7e02326f..8b33861681 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_CTIME_NSEC(st) != mtime.nsec
+ || ST_MTIME_NSEC(st) != mtime.nsec
#endif
)
die("shallow file was changed during fetch");