Merge pull request #893 from stevenwdv/regex-patch

Fix regex in parse-push.ts
steveukx · Feb 2, 2023 · 1cf707d · 1cf707d
2 parents 0d44e0a + 9971b23
commit 1cf707d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/.changeset/chilly-apples-attend.md b/.changeset/chilly-apples-attend.md
@@ -0,0 +1,5 @@
+---
+"simple-git": patch
+---
+
+Fix overly permissive regex in push parser
diff --git a/simple-git/src/lib/parsers/parse-push.ts b/simple-git/src/lib/parsers/parse-push.ts
@@ -34,7 +34,7 @@ const parsers: LineParser<PushDetail>[] = [
          local,
       };
    }),
-   new LineParser(/^[*-=]\s+([^:]+):(\S+)\s+\[(.+)]$/, (result, [local, remote, type]) => {
+   new LineParser(/^[=*-]\s+([^:]+):(\S+)\s+\[(.+)]$/, (result, [local, remote, type]) => {
       result.pushed.push(pushResultPushedItem(local, remote, type));
    }),
    new LineParser(

diff --git a/simple-git/test/unit/push.spec.ts b/simple-git/test/unit/push.spec.ts
@@ -103,6 +103,19 @@ describe('push', () => {
          return aPushedBranch(local, remote, state, false);
       }
 
+      it('will not match ill-formed push lines', () => {
+         givenTheResponse({
+            stdOut: [
+               '*       refs/tags/tag-one:refs/tags/tag-one     [up to date]',
+               '2       refs/tags/tag-one:refs/tags/tag-one     [up to date]',
+               '=       refs/tags/tag-one:refs/tags/tag-one     [up to date]',
+            ].join('\n'),
+            stdErr: '',
+         });
+
+         expect(actual.pushed).toHaveLength(2);
+      });
+
       it('parses pushing tags as well as branches', () => {
          givenTheResponse(pushNewBranchWithTags);
          expect(actual).toEqual(