diff options
| author |   joris <joris@openbsd.org> | 2009-04-03 19:46:56 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2009-04-03 19:46:56 +0000 |
| commit | 52a6632994670c3e22e6feb38ce5212426f7e10f (patch) | |
| tree | c790cfe7e09cceabefd3da5bacd4442131d104e1 /usr.bin/cvs/diff.c | |
| parent | detypedef drm_local_map. (diff) | |
| download | wireguard-openbsd-52a6632994670c3e22e6feb38ce5212426f7e10f.tar.xz wireguard-openbsd-52a6632994670c3e22e6feb38ce5212426f7e10f.zip | |
i fucked up last night, bad so partially revert a piece of
code that wasnt suppose to dissapear:
for uptodate files, we want to compare rev1 against
file_rcsrev to see if we wish to diff or not. saves a bit off logic.
commited with opencvs,
permission by deraadt@
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 98c8dac4d81..2fdef195f97 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.150 2009/04/03 08:18:44 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.151 2009/04/03 19:46:56 joris Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -410,6 +410,11 @@ cvs_diff_local(struct cvs_file *cf) switch (cvs_cmdop) { case CVS_OP_DIFF: + if (cf->file_status == FILE_UPTODATE) { + if (diff_rev2 == NULL && + !rcsnum_cmp(diff_rev1, cf->file_rcsrev, 0)) + goto cleanup; + } break; case CVS_OP_RDIFF: if (diff_rev1 == NULL && diff_rev2 == NULL) |