Merge branch 'master' into skip-gpg-sign-option

ruby-git · Aug 17, 2022 · 049b379 · 049b379
2 parents 8743556 + 609ab8b
commit 049b379
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -5,6 +5,7 @@ on:
     branches: [master]
   pull_request:
     branches: [master]
+  workflow_dispatch:
 
 jobs:
   continuous_integration_build:

diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../test_helper'
+require "fileutils"
 
 # tests all the low level git communication
 #
@@ -51,8 +52,13 @@ def test_commit_with_no_verify
     move_file(pre_commit_path, pre_commit_path_bak)
 
     # Adds a pre-commit file that should throw an error
-    create_file(pre_commit_path, 'echo Pre-commit file. Shoud not execute; exit 1') # Error when executed
-    File.chmod(0111, pre_commit_path)
+    create_file(pre_commit_path, <<~PRE_COMMIT_SCRIPT)
+      #!/bin/sh
+      echo "pre-commit script exits with an error"
+      exit 1
+    PRE_COMMIT_SCRIPT
+
+    FileUtils.chmod("+x", pre_commit_path)
 
     create_file("#{@wdir}/test_file_2", 'content test_file_2')
     @lib.add('test_file_2')