Merge pull request #43 from pH5/topicless-tag

umpf: Fix topicless tag creation

tests/meson.build

@@ -19,6 +19,7 @@ tests = [
   'umpf-series-tag-continue',
   'umpf-series-tag-rerere',
   'umpf-series-tag-continue-flags',
+  'umpf-series-tag-empty',
   'umpf-format-patch',
   'umpf-format-patch-bb',
   'umpf-show',

tests/series-empty-v2.ref

@@ -0,0 +1,4 @@
+# umpf-base: base
+# umpf-name: name
+# umpf-version: name/20221209-2
+# umpf-end

tests/umpf-series-tag-empty

@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# Test creating an umpf tag from a series file without any topics.
+#
+
+umpf tag --version=2 --base=base --name=name --remote=origin
+
+git log --format=%B -n 1 | grep "^# umpf-" > series.tag
+diff -u ${TEST_DIR}/series-empty-v2.ref series.tag

umpf

@@ -1283,6 +1283,7 @@ Upstream-Status: Inappropriate [autogenerated]"
 
 create_tag() {
 	local args tagname parents tree topic
+	local -a topics
 
 	if [ ! -e "${STATE}/tag" ]; then
 		return
@@ -1294,9 +1295,12 @@ create_tag() {
 	fi
 
 	tree="$(${GIT} log -1 --format="%T")"
-	for topic in $(<"${STATE}/topics"); do
-		parents="${parents} -p ${topic}"
-	done
+	if [ -e "${STATE}/topics" ]; then
+		mapfile -t topics < "${STATE}/topics"
+		for topic in "${topics[@]}"; do
+			parents="${parents} -p ${topic}"
+		done
+	fi
 	commit=$(${GIT} commit-tree "${tree}" -p HEAD ${parents} -m "${tagname}" -F "${STATE}/series.next")
 
 	if ${GIT} tag ${args} --cleanup=verbatim -F "${STATE}/series.next" "${tagname}" "${commit}" >&2; then