Commit 263463a7 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Correct pre_commit_run assumption that CI_COMMIT_BRANCH always available

parent 342ba6a4

.gitlab-ci.pre-commit-run.bash

+4 −4
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ pre_commit_run() ( 
	declare -a PRE_COMMIT_ARGS



	find_lca() {

		local repo=$CI_REPOSITORY_URL current_branch=$CI_COMMIT_BRANCH

		local other_branch=$1

		local repo=$CI_REPOSITORY_URL

		local current_branch=$1 other_branch=$2



		# See https://stackoverflow.com/questions/63878612/git-fatal-error-in-object-unshallow-sha-1

		# and https://stackoverflow.com/questions/4698759/converting-git-repository-to-shallow/53245223#53245223
@@ -43,9 +43,9 @@ pre_commit_run() ( 
	if [[ -v CI_COMMIT_BEFORE_SHA ]] && [[ ! $CI_COMMIT_BEFORE_SHA =~ ^0{40}$ ]]; then

		fetch_ref $CI_COMMIT_BEFORE_SHA

	elif [[ -v CI_MERGE_REQUEST_TARGET_BRANCH_NAME ]]; then

		find_lca $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

		find_lca $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

	elif [[ $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH ]]; then

		find_lca $CI_DEFAULT_BRANCH

		find_lca $CI_COMMIT_BRANCH $CI_DEFAULT_BRANCH

	fi



	if [[ -v FROM_REF ]]; then