svn commit: r1379644 - /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

[olamy]

Author: olamy
Date: Fri Aug 31 22:23:39 2012
New Revision: 1379644

URL: http://svn.apache.org/viewvc?rev=1379644&view=rev
Log:
[SCM-692] git remove command fail to delete directories.

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=1379644&r1=1379643&r2=1379644&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
 Fri Aug 31 22:23:39 2012
@@ -78,10 +78,22 @@ public class GitRemoveCommand
 
         for ( File file : files )
         {
-            if ( file.isDirectory() )
+            if ( file.isAbsolute() )
             {
-                cl.createArg().setValue( "-r" );
-                break;
+                if ( file.isDirectory() )
+                {
+                    cl.createArg().setValue( "-r" );
+                    break;
+                }
+            }
+            else
+            {
+                File absFile = new File( workingDirectory, file.getPath() );
+                if ( absFile.isDirectory() )
+                {
+                    cl.createArg().setValue( "-r" );
+                    break;
+                }
             }
         }