You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/09/19 21:52:19 UTC
[1/3] git commit: not need to try copying directory if not existing
Updated Branches:
refs/heads/master abd6a1ff9 -> 581909b8b
not need to try copying directory if not existing
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/581909b8
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/581909b8
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/581909b8
Branch: refs/heads/master
Commit: 581909b8bec5c058347c91eddff40e343c6a8e9a
Parents: 2a60ea5
Author: olivier lamy <ol...@apache.org>
Authored: Wed Sep 19 21:52:10 2012 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Sep 19 21:52:10 2012 +0200
----------------------------------------------------------------------
.../maven/scm/provider/git/GitScmTestUtils.java | 19 +++++++++-----
1 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/581909b8/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
index 9d23619..ea9448c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
@@ -63,7 +63,12 @@ public final class GitScmTestUtils
FileUtils.copyDirectoryStructure( src, repository );
- FileUtils.copyDirectoryStructure( new File( src, "dotgit" ), new File( repository, ".git" ) );
+ File dotGitDirectory = new File( src, "dotgit" );
+
+ if ( dotGitDirectory.exists() )
+ {
+ FileUtils.copyDirectoryStructure( dotGitDirectory, new File( repository, ".git" ) );
+ }
FileUtils.deleteDirectory( workingDirectory );
@@ -105,17 +110,17 @@ public final class GitScmTestUtils
return "scm:" + provider + ":file://" + repositoryRoot;
}
-
-
- public static void deleteAllDirectories( File startDirectory, String pattern )
- throws IOException
+
+
+ public static void deleteAllDirectories( File startDirectory, String pattern )
+ throws IOException
{
- if ( startDirectory.isDirectory() )
+ if ( startDirectory.isDirectory() )
{
File[] childs = startDirectory.listFiles();
for ( int i = 0; i < childs.length; i++ )
{
- File child = childs[ i ];
+ File child = childs[i];
if ( child.isDirectory() )
{
if ( child.getName().equals( pattern ) )