summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2009-04-03 08:18:45 +0000
committerJoris Vink <joris@cvs.openbsd.org>2009-04-03 08:18:45 +0000
commit39f97fc6ec43587a094733fca5d740e3e1e31cdf (patch)
tree4be2940cf56e2eaa9e59b187bbcf00823ddf2835 /usr.bin/cvs
parent8c2bde01f33b702d1b802c0b52d0cd411a9fe5b7 (diff)
my last commit to diff.c broke diffing in some cases,
noticed the hard way here at work. commiting with opencvs, permission by deraadt@
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/diff.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index d8271f77b4a..98c8dac4d81 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.149 2009/04/02 21:13:50 joris Exp $ */
+/* $OpenBSD: diff.c,v 1.150 2009/04/03 08:18:44 joris Exp $ */
/*
* Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
@@ -410,9 +410,6 @@ cvs_diff_local(struct cvs_file *cf)
switch (cvs_cmdop) {
case CVS_OP_DIFF:
- if (diff_rev1 != NULL && diff_rev2 == NULL &&
- rcsnum_cmp(diff_rev1, cf->file_ent->ce_rev, 0) == 0)
- goto cleanup;
break;
case CVS_OP_RDIFF:
if (diff_rev1 == NULL && diff_rev2 == NULL)