From 21ce8fed6c522c1e974d441434c498dc98482cd6 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 18 Jun 2025 15:03:44 +0200 Subject: [PATCH] Execute pre_commit_script as a complete path Prior to this the pre_commit_script needed to be in contrib, as shipped by the gem. This gives complete freedom on what to run, which gives a lot more freedom. --- contrib/openstack-commit-msg-hook.sh | 8 -------- lib/modulesync/repository.rb | 7 +++---- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 100755 contrib/openstack-commit-msg-hook.sh diff --git a/contrib/openstack-commit-msg-hook.sh b/contrib/openstack-commit-msg-hook.sh deleted file mode 100755 index 9c2cc27f..00000000 --- a/contrib/openstack-commit-msg-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -commit_msg_path=$1/.git/hooks/commit-msg - -if [ ! -f $commit_msg_path ]; then - curl -s -Lo $commit_msg_path http://review.openstack.org/tools/hooks/commit-msg - chmod 775 $commit_msg_path -fi diff --git a/lib/modulesync/repository.rb b/lib/modulesync/repository.rb index cc277f39..2f54a953 100644 --- a/lib/modulesync/repository.rb +++ b/lib/modulesync/repository.rb @@ -144,10 +144,9 @@ def submit_changes(files, options) opts_push = {} opts_commit = { amend: true } if options[:amend] opts_push = { force: true } if options[:force] - if options[:pre_commit_script] - script = "#{File.dirname(__FILE__, 3)}/contrib/#{options[:pre_commit_script]}" - system(script, @directory) - end + + system(options[:pre_commit_script], @directory) if options[:pre_commit_script] + if repo.status.changed.empty? && repo.status.added.empty? && repo.status.deleted.empty? puts "There were no changes in '#{@directory}'. Not committing." return false