Fix/non strings (#867)

steveukx · web-flow · commit de570acd0526 · 2022-11-30T15:15:57.000Z
Resolves an issue whereby non-strings can be passed into the config switch detector. Closes #866
diff --git a/.changeset/unlucky-dragons-fry.md b/.changeset/unlucky-dragons-fry.md
@@ -0,0 +1,5 @@
+---
+'simple-git': patch
+---
+
+Resolves an issue whereby non-strings can be passed into the config switch detector.
diff --git a/simple-git/src/lib/plugins/block-unsafe-operations-plugin.ts b/simple-git/src/lib/plugins/block-unsafe-operations-plugin.ts
@@ -3,8 +3,8 @@ import type { SimpleGitPlugin } from './simple-git-plugin';
 import { GitPluginError } from '../errors/git-plugin-error';
 import type { SimpleGitPluginConfig } from '../types';
 
-function isConfigSwitch(arg: string) {
-   return arg.trim().toLowerCase() === '-c';
+function isConfigSwitch(arg: string | unknown) {
+   return typeof arg === 'string' && arg.trim().toLowerCase() === '-c';
 }
 
 function preventProtocolOverride(arg: string, next: string) {
diff --git a/simple-git/test/integration/plugin.unsafe.spec.ts b/simple-git/test/integration/plugin.unsafe.spec.ts
@@ -13,6 +13,12 @@ describe('add', () => {
 
    beforeEach(async () => (context = await createTestContext()));
 
+   it('ignores non string arguments', async () => {
+      const { threw } = await promiseResult(newSimpleGit(context.root).raw([['init']] as any));
+
+      expect(threw).toBe(false);
+   });
+
    it('allows overriding protocol when opting in to unsafe practices', async () => {
       const { threw } = await promiseResult(
          newSimpleGit(context.root, { unsafe: { allowUnsafeProtocolOverride: true } }).raw(

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'simple-git': patch
 +---
++
 +Resolves an issue whereby non-strings can be passed into the config switch detector.
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ import type { SimpleGitPlugin } from './simple-git-plugin';`
`3`	`3`	`import { GitPluginError } from '../errors/git-plugin-error';`
`4`	`4`	`import type { SimpleGitPluginConfig } from '../types';`
`5`	`5`
`6`		`-function isConfigSwitch(arg: string) {`
`7`		`- return arg.trim().toLowerCase() === '-c';`
	`6`	`+function isConfigSwitch(arg: string \| unknown) {`
	`7`	`+ return typeof arg === 'string' && arg.trim().toLowerCase() === '-c';`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`function preventProtocolOverride(arg: string, next: string) {`