diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-05-27 22:41:01 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-05-27 22:41:01 +0000 |
| commit | a5d8f0873adc755a360bb4b8d2ffcedc3f41254a (patch) | |
| tree | 8a8512e100e2af28bc01fe6be0c058e499763327 | |
| parent | b4a1630894f800644f15e731fe3614e82232ec32 (diff) | |
if the user specified a revision to diff, stop caring if the file is
up to date.
| -rw-r--r-- | usr.bin/cvs/diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 1deb7336b16..38464da1748 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.36 2005/05/24 04:12:25 jfb Exp $ */ +/* $OpenBSD: diff.c,v 1.37 2005/05/27 22:41:00 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -599,7 +599,7 @@ cvs_diff_local(CVSFILE *cf, void *arg) if (cf->cf_cvstat == CVS_FST_UNKNOWN) { cvs_log(LP_WARN, "I know nothing about %s", diff_file); return (0); - } else if (cf->cf_cvstat == CVS_FST_UPTODATE) + } else if (cf->cf_cvstat == CVS_FST_UPTODATE && r1 == NULL) return (0); /* at this point, the file is modified */ |