[SCM-1003] gitexe remove command fails for filenames which start with…

… '-' This closes #163
apache · Oct 15, 2022 · 1624f4b · 1624f4b
1 parent bb811c5
commit 1624f4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...c/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java b/...c/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
@@ -101,6 +101,9 @@ public static Commandline createCommandLine( File workingDirectory, List<File> f
  }
  }
 
+ // 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/...st/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java b/...st/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommandTest.java
@@ -47,7 +47,7 @@ public void testCommandRemoveWithFile()
 
  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 void testCommandRemoveWithDirectory()
 
  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 void testCommandRemoveWithTwoDirectory()
  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 );
  }