From 2e351e33ad9d30139f4565eae13587c68f7e52b7 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 6 Jun 2025 12:58:40 +0200 Subject: [PATCH] umpf: keep the first commit-ish for a branch when creating the umpf from an umerge When an umpf is created from a umerge, the same topic branch may be found multiple times: 1. The actual merge for the topic in the umerge 2. as a base for another topic The commit-ish from the first case is the relevant one. All others may use older versions of the topic branch, so ignore those when creating the useries. Without this, creating an identical tag from a umerge will use the wrong version of the topic branch. Signed-off-by: Michael Olbrich --- umpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/umpf b/umpf index 169355f..23e57a3 100755 --- a/umpf +++ b/umpf @@ -700,8 +700,8 @@ import_series() { branch_names[${#branch_names[@]}]="${name}" branch_squashes[${name}]="${squash}" names="${names}${name}#" + tmp_branches[${name}]="${branch}" fi - tmp_branches[${name}]="${branch}" done for name in "${branch_names[@]}"; do branch="${tmp_branches[${name}]}"