summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff.c
diff options
context:
space:
mode:
authorjoris <joris@openbsd.org>2007-01-26 11:19:44 +0000
committerjoris <joris@openbsd.org>2007-01-26 11:19:44 +0000
commit47e5fe6305cfb0a8f1e6bda0ced1389f6a862c47 (patch)
tree01540ad60ae48c9938faf932efe64ed60f055d91 /usr.bin/cvs/diff.c
parentremove ancient device-specific trick from ffs1_blkpref() (diff)
downloadwireguard-openbsd-47e5fe6305cfb0a8f1e6bda0ced1389f6a862c47.tar.xz
wireguard-openbsd-47e5fe6305cfb0a8f1e6bda0ced1389f6a862c47.zip
Handle CVS/Entries and file timestamp correctly so we do
not mistakenly see a file as Modified while it is not. As a result, we can remove the very hackish cvs_hack_time() and GNU cvs and opencvs should almost get along now. lotsa help and okay The otto@
Diffstat (limited to 'usr.bin/cvs/diff.c')
-rw-r--r--usr.bin/cvs/diff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index ba3774d724c..3b09f599cf6 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.115 2007/01/20 01:07:51 niallo Exp $ */
+/* $OpenBSD: diff.c,v 1.116 2007/01/26 11:19:44 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -238,7 +238,6 @@ cvs_diff_local(struct cvs_file *cf)
if ((b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL)
fatal("failed to load %s", cf->file_path);
- st.st_mtime = cvs_hack_time(st.st_mtime, 1);
tv2[0].tv_sec = st.st_mtime;
tv2[0].tv_usec = 0;
tv2[1] = tv2[0];