fix: allow branches without labels

steveukx · Jan 20, 2022 · 07a1388 · 07a1388
1 parent 0907d00
commit 07a1388
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/simple-git/src/lib/parsers/parse-branch.ts b/simple-git/src/lib/parsers/parse-branch.ts
@@ -10,7 +10,7 @@ const parsers: LineParser<BranchSummaryResult>[] = [
          name, commit, label
       );
    }),
-   new LineParser(/^(\*\s)?(\S+)\s+([a-z0-9]+)\s(.*)$/s, (result, [current, name, commit, label]) => {
+   new LineParser(/^(\*\s)?(\S+)\s+([a-z0-9]+)\s?(.*)$/s, (result, [current, name, commit, label]) => {
       result.push(
          !!current,
          false,

diff --git a/simple-git/test/unit/branch.spec.ts b/simple-git/test/unit/branch.spec.ts
@@ -209,6 +209,38 @@ describe('branch', () => {
             all: ['2b2dba2', 'cflynn07-add-git-ignore', 'master'],
          }));
       });
+
+      it('branches without labels', async () => {
+         const actual = parseBranchSummary(`
+* stable                f8cc2bc
+  remotes/origin/stable f8cc2bd
+  dev                   f8cc2be wip
+         `);
+         expect(actual).toEqual(like({
+            current: 'stable',
+            all: ['stable', 'remotes/origin/stable', 'dev'],
+            branches: {
+               stable: {
+                  commit: 'f8cc2bc',
+                  current: true,
+                  label: '',
+                  name: 'stable',
+               },
+               ['remotes/origin/stable']: {
+                  commit: 'f8cc2bd',
+                  current: false,
+                  label: '',
+                  name: 'remotes/origin/stable',
+               },
+               dev: {
+                  commit: 'f8cc2be',
+                  current: false,
+                  label: 'wip',
+                  name: 'dev',
+               },
+            }
+         }));
+      });
    });
 
    describe('usage', () => {