mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 05:52:26 +00:00
#190: CVS update regression.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1256 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
58660e7ca8
commit
e51300f4d6
1 file changed
+11
-2
@@ -278,9 +278,18 @@ public class CVSSCM extends AbstractCVSFamilySCM {
|
||||
// Add in any existing CVS dirs, in case project checked out its own.
|
||||
File[] subdirs = workspace.getLocal().listFiles();
|
||||
if (subdirs != null) {
|
||||
for (File s : subdirs) {
|
||||
SUBDIR: for (File s : subdirs) {
|
||||
if (new File(s, "CVS").isDirectory()) {
|
||||
moduleNames.add(s.getName());
|
||||
String top = s.getName();
|
||||
for (String mod : moduleNames) {
|
||||
if (mod.startsWith(top + "/")) {
|
||||
// #190: user asked to check out foo/bar foo/baz quux
|
||||
// Our top-level dirs are "foo" and "quux".
|
||||
// Do not add "foo" to checkout or we will check out foo/*!
|
||||
continue SUBDIR;
|
||||
}
|
||||
}
|
||||
moduleNames.add(top);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user