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

michael-o · michael-o · commit 1624f4be3290 · 2022-10-15T22:00:15.000+02:00
This closes #163
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
@@ -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/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 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 );
     }

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,9 @@ public static Commandline createCommandLine( File workingDirectory, List<File> f`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ // use this separator to make clear that the following parameters are files and options.`
	`105`	`+ cl.createArg().setValue( "--" );`
	`106`	`+`
`104`	`107`	`GitCommandLineUtils.addTarget( cl, files );`
`105`	`108`
`106`	`109`	`return cl;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public void testCommandRemoveWithFile()`
`47`	`47`
`48`	`48`	`Commandline cl = GitRemoveCommand.createCommandLine( workingDirectory, Arrays.asList( toBeRemoved ) );`
`49`	`49`
`50`		`- assertCommandLine( "git rm toto.xml", workingDirectory, cl );`
	`50`	`+ assertCommandLine( "git rm -- toto.xml", workingDirectory, cl );`
`51`	`51`
`52`	`52`	`FileUtils.deleteDirectory( workingDirectory );`
`53`	`53`	`}`
`@@ -63,7 +63,7 @@ public void testCommandRemoveWithDirectory()`
`63`	`63`
`64`	`64`	`Commandline cl = GitRemoveCommand.createCommandLine( workingDirectory, Arrays.asList( toBeRemoved ) );`
`65`	`65`
`66`		`- assertCommandLine( "git rm -r toto", workingDirectory, cl );`
	`66`	`+ assertCommandLine( "git rm -r -- toto", workingDirectory, cl );`
`67`	`67`
`68`	`68`	`FileUtils.deleteDirectory( workingDirectory );`
`69`	`69`	`}`
`@@ -83,7 +83,7 @@ public void testCommandRemoveWithTwoDirectory()`
`83`	`83`	`Commandline cl =`
`84`	`84`	`GitRemoveCommand.createCommandLine( workingDirectory, Arrays.asList( toBeRemoved1, toBeRemoved2 ) );`
`85`	`85`
`86`		`- assertCommandLine( "git rm -r toto tata", workingDirectory, cl );`
	`86`	`+ assertCommandLine( "git rm -r -- toto tata", workingDirectory, cl );`
`87`	`87`
`88`	`88`	`FileUtils.deleteDirectory( workingDirectory );`
`89`	`89`	`}`