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 2011/11/14 09:04:48 UTC
svn commit: r1201620 -
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
Author: olamy
Date: Mon Nov 14 08:04:48 2011
New Revision: 1201620
URL: http://svn.apache.org/viewvc?rev=1201620&view=rev
Log:
[SCM-644] Correctly remove directory in gitexe provider
Submitted by Bertrand Paquet.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java?rev=1201620&r1=1201619&r2=1201620&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java Mon Nov 14 08:04:48 2011
@@ -70,9 +70,16 @@ public class GitRemoveCommand extends Ab
public static Commandline createCommandLine( File workingDirectory, List<File> files )
throws ScmException
{
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "rm" );
+ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "rm" );
- GitCommandLineUtils.addTarget( cl, files );
+ for(File file : files) {
+ if (file.isDirectory()) {
+ cl.createArg().setValue("-r");
+ break;
+ }
+ }
+
+ GitCommandLineUtils.addTarget( cl, files );
return cl;
}