Skip to content

Commit

Permalink
umpf: fix extra / when using --override=singlearg
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
a3f committed Nov 27, 2024
1 parent a3616f4 commit 89fc6ea
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions umpf
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ usage() {
use commit-ish instead for the topic. May be
specified more than once. If only <topic> is
specified, it's interpreted as
<topic>=<remote>/<topic>
<topic>=[<remote>/]<topic>
-u, --update with --patchdir: update existing patches in <path>
-v, --version <version> with tag: overwrite version number [default: 1]
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 89fc6ea

Please sign in to comment.