diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2009-03-19 10:09:17 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2009-03-19 10:09:17 +0000 |
| commit | 85d5134342566b2528c2a7487cca19a494724d32 (patch) | |
| tree | 7fc8b41247bd38aa01086fd63055a8d09d0cd734 | |
| parent | 292568973e55d095aa3dba38d80e3fd4bc993fe8 (diff) | |
do not diff files server-side that are uptodate but require a patch,
as the client does not provide these files at all because they are
not modified in anyway. otherwise this results in bad mojo.
found by myself and sthen@
| -rw-r--r-- | usr.bin/cvs/diff.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index c71bd1d1f69..ab7ff86b857 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.145 2009/02/21 14:50:53 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.146 2009/03/19 10:09:16 joris Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -324,6 +324,9 @@ cvs_diff_local(struct cvs_file *cf) date1 == -1 && date2 == -1) return; + if (cf->file_status == FILE_PATCH) + return; + if (cf->file_rcs != NULL && cf->file_rcs->rf_head == NULL) { cvs_log(LP_ERR, "no head revision in RCS file for %s\n", cf->file_path); |