diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-10 17:34:37 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-06-10 17:34:37 +0000 |
| commit | 190f5a7f36678077e50338d189e8810c7c691c26 (patch) | |
| tree | 151414934bba2efcdf972cbfb44002bf0473b198 /usr.bin | |
| parent | 235a6ade5d50687759b4400c8a3f223c44ec5793 (diff) | |
Omit "cannot find file" on server-side if client runs "diff" on an up-to-date
file, because it won't be sent to server then.
ok joris
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/diff.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 92e49ea61e2..2720a881adf 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.137 2008/05/30 11:06:17 tobias Exp $ */ +/* $OpenBSD: diff.c,v 1.138 2008/06/10 17:34:36 tobias Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -276,8 +276,9 @@ cvs_diff_local(struct cvs_file *cf) return; } if (cf->fd == -1) { - cvs_log(LP_ERR, "cannot find %s", - cf->file_path); + if (!cvs_server_active) + cvs_log(LP_ERR, "cannot find %s", + cf->file_path); return; } break; @@ -295,8 +296,9 @@ cvs_diff_local(struct cvs_file *cf) break; default: if (cf->fd == -1) { - cvs_log(LP_ERR, "cannot find %s", - cf->file_path); + if (!cvs_server_active) + cvs_log(LP_ERR, "cannot find %s", + cf->file_path); return; } if (cf->file_rcs == NULL) { |