fix: keep splitter if no path specs exist (#929)

steveukx · Jun 21, 2023 · 2ab1936 · 2ab1936
1 parent f101061
commit 2ab1936
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/.changeset/nice-laws-invite.md b/.changeset/nice-laws-invite.md
@@ -0,0 +1,5 @@
+---
+'simple-git': patch
+---
+
+keep path splitter without path specs
diff --git a/simple-git/src/lib/plugins/suffix-paths.plugin.ts b/simple-git/src/lib/plugins/suffix-paths.plugin.ts
@@ -7,16 +7,19 @@ export function suffixPathsPlugin(): SimpleGitPlugin<'spawn.args'> {
       action(data) {
          const prefix: string[] = [];
          const suffix: string[] = [];
+         let suffixFound: boolean = false;
 
          for (let i = 0; i < data.length; i++) {
             const param = data[i];
 
             if (isPathSpec(param)) {
+               suffixFound = true;
                suffix.push(...toPaths(param));
                continue;
             }
 
             if (param === '--') {
+               suffixFound = true;
                suffix.push(
                   ...data
                      .slice(i + 1)
@@ -28,7 +31,7 @@ export function suffixPathsPlugin(): SimpleGitPlugin<'spawn.args'> {
             prefix.push(param);
          }
 
-         return !suffix.length ? prefix : [...prefix, '--', ...suffix.map(String)];
+         return suffixFound ? [...prefix, '--', ...suffix.map(String)] : prefix;
       },
    };
 }
diff --git a/simple-git/test/unit/plugin.pathspec.spec.ts b/simple-git/test/unit/plugin.pathspec.spec.ts
@@ -53,4 +53,12 @@ describe('suffixPathsPlugin', function () {
       await closeWithSuccess();
       assertExecutedCommands('pull', 'foo', 'bar', '--', 'a', 'b', 'c', 'd');
    });
+
+   it('keep splitter without path specs', async () => {
+      git.raw(['a', '--']);
+      await closeWithSuccess();
+
+      assertExecutedCommands('a', '--');
+   });
+
 });