From 286ade6fbd717a455ffe9cef65a6a747188bbacf Mon Sep 17 00:00:00 2001
From: joris <joris@openbsd.org>
Date: Thu, 2 Apr 2009 09:09:40 +0000
Subject: make sure diffing -rTAG -rTAG works even if files are uptodate

commited with opencvs,
with permission by deraadt@
---
 usr.bin/cvs/diff.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.bin/cvs/diff.c')

diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 44aacf04af9..43e298117ef 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.147 2009/03/23 07:28:05 joris Exp $	*/
+/*	$OpenBSD: diff.c,v 1.148 2009/04/02 09:09:40 joris Exp $	*/
 /*
  * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org>
  * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
@@ -414,6 +414,7 @@ cvs_diff_local(struct cvs_file *cf)
 	switch (cvs_cmdop) {
 	case CVS_OP_DIFF:
 		if (cf->file_status == FILE_UPTODATE && diff_rev1 != NULL &&
+		    diff_rev2 == NULL &&
 		    rcsnum_cmp(diff_rev1, cf->file_rcsrev, 0) == 0)
 			goto cleanup;
 		break;
-- 
cgit v1.2.3-59-g8ed1b