From 3065d178dda538239c3c6d6dccd43d7a90facc23 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 12 Jul 2022 18:11:07 -0500 Subject: [PATCH] build2.sh: Fix quoting error git merge "" does not work. We want the value to be ommited if gpgsign isn't defined. --- rebuilds/build2.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rebuilds/build2.sh b/rebuilds/build2.sh index 226f734..3570b9d 100755 --- a/rebuilds/build2.sh +++ b/rebuilds/build2.sh @@ -42,7 +42,7 @@ bump_and_commit() { rpmdev-bumpspec -c "${message}" "${package}.spec" | tee -a "${logfmt}" # --allow-empty is neded for rpmautospec git add "${package}.spec" - git commit "${gpgsign:-}" --allow-empty -m "${message}" | tee -a "${logfmt}" + git commit ${gpgsign:-} --allow-empty -m "${message}" | tee -a "${logfmt}" } branch="${branch:-f35}" @@ -93,7 +93,7 @@ git reset --hard "origin/${branch}" mkdir -p "${logdir}" if [ "${action}" == "merge" ] || [ "${action}" == "rawhide_commit" ]; then - git merge "${gpgsign:-}" origin/rawhide | tee -a "${logfmt}" + git merge ${gpgsign:-} origin/rawhide | tee -a "${logfmt}" elif [ "${action}" == "commit" ]; then bump_and_commit fi -- 2.45.2