summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-02-03 15:20:11 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-02-03 15:20:11 +0000
commit951dd72856ac8c6133980934f4c1bd7b2e8345a4 (patch)
treef324be31b3d6d7b8acc193de19ff4dffad87f743
parenta07dafed2f8b335310a5f8703243e687f1eed1cc (diff)
cvs_update_leavedir is only useful if dirs have to be pruned.
OK joris@
-rw-r--r--usr.bin/cvs/checkout.c4
-rw-r--r--usr.bin/cvs/update.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index 729d44de46a..76721694965 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checkout.c,v 1.117 2008/02/03 15:08:04 tobias Exp $ */
+/* $OpenBSD: checkout.c,v 1.118 2008/02/03 15:20:10 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -280,7 +280,7 @@ checkout_repository(const char *repobase, const char *wdbase)
cr.leavedir = NULL;
} else {
cr.enterdir = cvs_update_enterdir;
- cr.leavedir = cvs_update_leavedir;
+ cr.leavedir = prune_dirs ? cvs_update_leavedir : NULL;
}
cr.fileproc = cvs_update_local;
cr.flags = flags;
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 4b105b3022d..4044c87a3d2 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.117 2008/01/31 18:09:40 tobias Exp $ */
+/* $OpenBSD: update.c,v 1.118 2008/02/03 15:20:10 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -106,7 +106,7 @@ cvs_update(int argc, char **argv)
if (current_cvsroot->cr_method == CVS_METHOD_LOCAL) {
cr.enterdir = cvs_update_enterdir;
- cr.leavedir = cvs_update_leavedir;
+ cr.leavedir = prune_dirs ? cvs_update_leavedir : NULL;
cr.fileproc = cvs_update_local;
flags |= CR_REPO;
} else {