From e679b4ca18df1f17fb177b49f0426fb8f70c2a9f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 14 Jun 2022 14:00:25 +0200
Subject: Merging upstream version 20220614.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 git/bin/git-checkout-branches                    |  2 +-
 git/bin/git-whoami                               | 24 ++++++++++++------------
 git/share/hooks/post-update.d/irker-notification |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'git')

diff --git a/git/bin/git-checkout-branches b/git/bin/git-checkout-branches
index c0c586c..220386f 100755
--- a/git/bin/git-checkout-branches
+++ b/git/bin/git-checkout-branches
@@ -29,7 +29,7 @@ do
 	BRANCH="$(echo "${REMOTE_BRANCH}" | cut -d/ -f 2-)"
 
 	case "${BRANCH}" in
-		HEAD|${CURRENT_BRANCH})
+		HEAD|"${CURRENT_BRANCH}")
 			continue
 			;;
 	esac
diff --git a/git/bin/git-whoami b/git/bin/git-whoami
index 9cab9bc..50f432a 100755
--- a/git/bin/git-whoami
+++ b/git/bin/git-whoami
@@ -10,24 +10,24 @@
 set -e
 
 get_email() {
-	git config user.email || ( [ -n "$EMAIL" ] && echo "$EMAIL" ) || echo "$(id -nu)@$(hostname --fqdn)"
+	git config user.email || ( [ -n "${EMAIL}" ] && echo "${EMAIL}" ) || echo "$(id -nu)@$(hostname --fqdn)"
 }
 
 get_name() {
-	git config user.name || getent passwd $(id -un) | cut -d : -f 5 | cut -d , -f 1
+	git config user.name || getent passwd "$(id -un)" | cut -d : -f 5 | cut -d , -f 1
 }
 
-: ${GIT_AUTHOR_NAME=$(get_name)}
-: ${GIT_COMMITTER_NAME=$(get_name)}
-: ${GIT_AUTHOR_EMAIL=$(get_email)}
-: ${GIT_COMMITTER_EMAIL=$(get_email)}
+GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-$(get_name)}"
+GIT_AUTHOR_EMAIL="${GIT_AUTHOR_EMAIL:-$(get_email)}"
+GIT_COMMITTER_NAME="${GIT_COMMITER_NAME:-$(get_name)}"
+GIT_COMMITTER_EMAIL="${GIT_COMMITER_EMAIL:-$(get_email)}"
 
-author="$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>"
-commit="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+author="$GIT_AUTHOR_NAME <${GIT_AUTHOR_EMAIL}>"
+commit="$GIT_COMMITTER_NAME <${GIT_COMMITTER_EMAIL}>"
 
-if [ "$author" = "$commit" ]; then
-	echo "$author"
+if [ "${author}" = "${commit}" ]; then
+	echo "${author}"
 else
-	echo "Author: $author"
-	echo "Commit: $commit"
+	echo "Author: ${author}"
+	echo "Commit: ${commit}"
 fi
diff --git a/git/share/hooks/post-update.d/irker-notification b/git/share/hooks/post-update.d/irker-notification
index 1ad6f54..7c712db 100755
--- a/git/share/hooks/post-update.d/irker-notification
+++ b/git/share/hooks/post-update.d/irker-notification
@@ -28,7 +28,7 @@ fi
 
 echo "sending IRC notification"
 
-while read OLD NEW REFNAME
+while read -r OLD NEW REFNAME
 do
-	irkerhook --refname=${REFNAME} $(git rev-list --reverse ${OLD}..${NEW})
+	irkerhook --refname="${REFNAME}" "$(git rev-list --reverse "${OLD}".."${NEW}")"
 done
-- 
cgit v1.2.3