diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-07-29 23:56:57 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-07-29 23:56:57 +0000 |
| commit | b9811873c24965804ac0c37937b4188b2a47467e (patch) | |
| tree | 714fbb4f779330d20a9de05afe180af3be7602eb | |
| parent | 4b50c27ec5ec786ab4022e61f94c0e58e969c883 (diff) | |
do not send a MODIFIED request to the server for a newly added file we
already removed again.
spotted by & ok xsa@
| -rw-r--r-- | usr.bin/cvs/remove.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c index 014bda32ce2..a6071171906 100644 --- a/usr.bin/cvs/remove.c +++ b/usr.bin/cvs/remove.c @@ -1,4 +1,4 @@ -/* $OpenBSD: remove.c,v 1.31 2005/07/29 22:59:10 joris Exp $ */ +/* $OpenBSD: remove.c,v 1.32 2005/07/29 23:56:56 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org> @@ -127,8 +127,11 @@ cvs_remove_remote(CVSFILE *cf, void *arg) return (CVS_EX_PROTO); if (cf->cf_cvstat != CVS_FST_LOST && force_remove != 1) { - if (cvs_sendreq(root, CVS_REQ_MODIFIED, cf->cf_name) < 0) { - return (CVS_EX_PROTO); + if (cf->cf_cvstat != CVS_FST_ADDED) { + if (cvs_sendreq(root, CVS_REQ_MODIFIED, + cf->cf_name) < 0) { + return (CVS_EX_PROTO); + } } if (cf->cf_flags & CVS_FILE_ONDISK) { |