summaryrefslogtreecommitdiff
path: root/usr.bin/cvs
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-01-10 09:47:06 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-01-10 09:47:06 +0000
commitfcfb76ace29ab3a387ee0582745009145e8f5b77 (patch)
tree31924cc54258e540cedc2f4c86a2c74cf1d87913 /usr.bin/cvs
parent00d9004b3b51d6c5d288c304e925ac19862fbf9e (diff)
Ignore CVS directories during import in remote setups. assert()ed GNU
cvs server and was unwanted behaviour anyway.
Diffstat (limited to 'usr.bin/cvs')
-rw-r--r--usr.bin/cvs/client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/client.c b/usr.bin/cvs/client.c
index 56e7028f671..a87351e96ab 100644
--- a/usr.bin/cvs/client.c
+++ b/usr.bin/cvs/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.84 2008/01/10 09:41:52 tobias Exp $ */
+/* $OpenBSD: client.c,v 1.85 2008/01/10 09:47:05 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -457,7 +457,7 @@ cvs_client_sendfile(struct cvs_file *cf)
if (cf->file_type == CVS_DIR)
return;
- if (cf->file_ent != NULL) {
+ if (cf->file_ent != NULL && cvs_cmdop != CVS_OP_IMPORT) {
if (cf->file_status == FILE_ADDED) {
len = strlcpy(rev, "0", sizeof(rev));
if (len >= sizeof(rev))