You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/10/15 20:00:43 UTC

[maven-scm] branch master updated: [SCM-1003] gitexe remove command fails for filenames which start with '-'

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git


The following commit(s) were added to refs/heads/master by this push:
     new 1624f4be3 [SCM-1003] gitexe remove command fails for filenames which start with '-'
1624f4be3 is described below

commit 1624f4be32907026314d73b34ff73a93a8ae7f57
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Oct 15 22:00:15 2022 +0200

    [SCM-1003] gitexe remove command fails for filenames which start with '-'
    
    This closes #163
---
 .../scm/provider/git/gitexe/command/remove/GitRemoveCommand.java    | 3 +++
 .../provider/git/gitexe/command/remove/GitRemoveCommandTest.java    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/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 b/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
index d790ae08f..ec4a7c8d9 100644
--- a/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
+++ b/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
@@ -101,6 +101,9 @@ public class GitRemoveCommand
             }
         }
 
+        // use this separator to make clear that the following parameters are files and options.
+        cl.createArg().setValue( "--" );
+
         GitCommandLineUtils.addTarget( cl, files );
 
         return cl;
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java
index 730ab5d6f..6d8fe4ad1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java
@@ -47,7 +47,7 @@ public class GitRemoveCommandTest
 
         Commandline cl = GitRemoveCommand.createCommandLine( workingDirectory, Arrays.asList( toBeRemoved ) );
 
-        assertCommandLine( "git rm toto.xml", workingDirectory, cl );
+        assertCommandLine( "git rm -- toto.xml", workingDirectory, cl );
 
         FileUtils.deleteDirectory( workingDirectory );
     }
@@ -63,7 +63,7 @@ public class GitRemoveCommandTest
 
         Commandline cl = GitRemoveCommand.createCommandLine( workingDirectory, Arrays.asList( toBeRemoved ) );
 
-        assertCommandLine( "git rm -r toto", workingDirectory, cl );
+        assertCommandLine( "git rm -r -- toto", workingDirectory, cl );
 
         FileUtils.deleteDirectory( workingDirectory );
     }
@@ -83,7 +83,7 @@ public class GitRemoveCommandTest
         Commandline cl =
             GitRemoveCommand.createCommandLine( workingDirectory, Arrays.asList( toBeRemoved1, toBeRemoved2 ) );
 
-        assertCommandLine( "git rm -r toto tata", workingDirectory, cl );
+        assertCommandLine( "git rm -r -- toto tata", workingDirectory, cl );
 
         FileUtils.deleteDirectory( workingDirectory );
     }