diff --git a/ci/ci-build-centos7 b/ci/ci-build-centos7
index c8e39fd0..c76c1668 100755
--- a/ci/ci-build-centos7
+++ b/ci/ci-build-centos7
@@ -16,7 +16,9 @@ fi
 
 CIIMAGEDIR=ci/images/ci-centos-7-x86_64
 BRANCH=${1:-HEAD}
-shift
+if [ "$#" -ge 1 ]; then
+	shift
+fi
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
diff --git a/ci/ci-build-centos8 b/ci/ci-build-centos8
index 05f24257..f40f5bf8 100755
--- a/ci/ci-build-centos8
+++ b/ci/ci-build-centos8
@@ -16,7 +16,9 @@ fi
 
 CIIMAGEDIR=ci/images/ci-centos-8-x86_64
 BRANCH=${1:-HEAD}
-shift
+if [ "$#" -ge 1 ]; then
+	shift
+fi
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
diff --git a/ci/ci-build-leap153 b/ci/ci-build-leap153
index 5eafa441..338d6384 100755
--- a/ci/ci-build-leap153
+++ b/ci/ci-build-leap153
@@ -16,7 +16,9 @@ fi
 
 CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.3-x86_64
 BRANCH=${1:-HEAD}
-shift
+if [ "$#" -ge 1 ]; then
+	shift
+fi
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
diff --git a/ci/ci-build-leap154 b/ci/ci-build-leap154
index 07a6ddfc..dc97b598 100755
--- a/ci/ci-build-leap154
+++ b/ci/ci-build-leap154
@@ -16,7 +16,9 @@ fi
 
 CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64
 BRANCH=${1:-HEAD}
-shift
+if [ "$#" -ge 1 ]; then
+	shift
+fi
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
diff --git a/ci/ci-build-musl b/ci/ci-build-musl
index 6ba932a8..78dc79e5 100755
--- a/ci/ci-build-musl
+++ b/ci/ci-build-musl
@@ -16,7 +16,9 @@ fi
 
 CIIMAGEDIR=ci/images/ci-musl-x86_64
 BRANCH=${1:-HEAD}
-shift
+if [ "$#" -ge 1 ]; then
+	shift
+fi
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"
diff --git a/ci/ci-build-tumbleweed b/ci/ci-build-tumbleweed
index e4c64959..ddcad063 100755
--- a/ci/ci-build-tumbleweed
+++ b/ci/ci-build-tumbleweed
@@ -16,7 +16,9 @@ fi
 
 CIIMAGEDIR=ci/images/ci-openSUSE-tumbleweed-x86_64
 BRANCH=${1:-HEAD}
-shift
+if [ "$#" -ge 1 ]; then
+	shift
+fi
 HASH=$(git log -1 --format='%h %s' "$BRANCH")
 
 echo "CI: Generate archive from $BRANCH ($HASH)"