Skip to content

Commit 8705353

Browse files
committed
fix: trim branch before uriencode
1 parent b63987f commit 8705353

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

git-open.zsh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ uriencode() {
1717
done
1818
}
1919

20+
trim() {
21+
echo "$1" | sed -E 's/^[ \t]+|[ \t]+$//g'
22+
}
23+
2024
git_get_remote() {
2125
remote=$(git remote -v | grep "(push)" | awk '{print $2}')
2226
echo $remote
@@ -214,8 +218,8 @@ git_open_new_pr() {
214218
default_branch="master"
215219
fi
216220

217-
branch=$(uriencode $branch)
218-
default_branch=$(uriencode $default_branch)
221+
branch="$(uriencode $(trim $branch))"
222+
default_branch="$(uriencode $(trim $default_branch))"
219223

220224
case "$remote_type" in
221225
github) open_url "$silent" "https://github.com/$repo_path/compare/$default_branch...$branch" ;;

tests/test.zsh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ describe "git_open_new_pr"
7979
assert_value "https://github.com/chenasraf/git-open/compare/develop...master" $(git_open_new_pr -f master develop)
8080
assert_value "https://github.com/chenasraf/git-open/compare/master...develop" $(git_open_new_pr -f develop)
8181
assert_value "https://github.com/chenasraf/git-open/compare/master...$current_branch" $(git_open_new_pr -f)
82+
assert_value "https://github.com/chenasraf/git-open/compare/develop...master" $(git_open_new_pr -f "master " " develop ")
8283

8384
describe "git_open_pipelines"
8485
assert_value "https://github.com/chenasraf/git-open/actions" $(git_open_pipelines)

0 commit comments

Comments
 (0)