fix prepare-commit-msg on windows (#737)

typicode · Dec 13, 2020 · eb1eeb8 · eb1eeb8
1 parent 65bc6e5
commit eb1eeb8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/sh/husky.sh b/sh/husky.sh
@@ -10,7 +10,7 @@ command_exists () {
 
 run_command () {
   if command_exists "$1"; then
-    "$@" husky-run $hookName "$gitParams"
+    "$@" husky-run $hookName $gitParams
 
     exitCode="$?"
     debug "$* husky-run exited with $exitCode exit code"

diff --git a/src/installer/__tests__/__snapshots__/scripts.ts.snap b/src/installer/__tests__/__snapshots__/scripts.ts.snap
@@ -39,7 +39,7 @@ command_exists () {
 
 run_command () {
   if command_exists \\"$1\\"; then
-    \\"$@\\" husky-run $hookName \\"$gitParams\\"
+    \\"$@\\" husky-run $hookName $gitParams
 
     exitCode=\\"$?\\"
     debug \\"$* husky-run exited with $exitCode exit code\\"

diff --git a/src/runner/__tests__/index.ts b/src/runner/__tests__/index.ts
@@ -138,8 +138,7 @@ describe('run', (): void => {
       })
     )
 
-    // 'commit-msg' takes one parameter from git
-    const status = await index(['', '', 'commit-msg', 'git fake param'], {
+    const status = await index(['', '', 'commit-msg', 'git', 'fake', 'param'], {
       cwd: dir,
     })
     expectSpawnSyncToHaveBeenCalledWith(dir, 'echo success', {

diff --git a/src/runner/index.ts b/src/runner/index.ts
@@ -74,7 +74,7 @@ function runCommand(
  * @param {promise} options.getStdinFn - used for mocking only
  */
 export default async function run(
-  [, , hookName = '', HUSKY_GIT_PARAMS]: string[],
+  [, , hookName = '', ...HUSKY_GIT_PARAMS]: string[],
   { cwd = process.cwd() }: { cwd?: string } = {}
 ): Promise<number> {
   const oldCommand = getOldCommand(cwd, hookName)
@@ -83,8 +83,8 @@ export default async function run(
   // Add HUSKY_GIT_PARAMS to env
   const env: Env = {}
 
-  if (HUSKY_GIT_PARAMS) {
-    env.HUSKY_GIT_PARAMS = HUSKY_GIT_PARAMS
+  if (HUSKY_GIT_PARAMS?.length) {
+    env.HUSKY_GIT_PARAMS = HUSKY_GIT_PARAMS.join(' ')
   }
 
   if (command) {