From 89fc6ea2b0a382fe7c44d847cc1ee3e11a451734 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Wed, 27 Nov 2024 13:12:49 +0100 Subject: [PATCH] umpf: fix extra / when using --override=singlearg Prior to processing the overrides, GIT_REMOTE, if set, is appended with a slash. Adding an extra slash later thus introduces breakage when no remote is specified: Revision '/v6.9/topic/foo' not found for topic 'v6.9/topic/foo' Fix by dropping the unnecessary slash. Signed-off-by: Ahmad Fatoum --- umpf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/umpf b/umpf index 3892a63..a6ea89c 100755 --- a/umpf +++ b/umpf @@ -192,7 +192,7 @@ usage() { use commit-ish instead for the topic. May be specified more than once. If only is specified, it's interpreted as - =/ + =[/] -u, --update with --patchdir: update existing patches in -v, --version with tag: overwrite version number [default: 1] @@ -352,7 +352,7 @@ setup() { local rev if [ -z "${OVERRIDES[$topic]}" ]; then - OVERRIDES[$topic]="${GIT_REMOTE}/${topic}" + OVERRIDES[$topic]="${GIT_REMOTE}${topic}" fi if ! rev="$(${GIT} rev-parse "${OVERRIDES[$topic]}^{}" 2> /dev/null)"; then