refactor: ci lint

This commit is contained in:
Wenxuan Zhang 2021-10-26 18:39:50 +08:00
parent ed51746687
commit 5d15fd3532
No known key found for this signature in database
GPG key ID: CCAF35548C65530F
2 changed files with 4 additions and 4 deletions

View file

@ -24,8 +24,8 @@
- Shell
- [ ] bash
- [ ] zsh
- [ ] fish
- [ ] zsh
- [ ] fish
- OS
- [ ] Linux
- [ ] Mac OS X

View file

@ -229,10 +229,10 @@ forgit::checkout::branch() {
"
branch="$(eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf --preview="$preview" | awk '{print $1}')"
[[ -z "$branch" ]] && return 1
# track the remote branch if possible
if [[ "$branch" == "remotes/origin/"* ]]; then
if [[ -n $(git branch | grep -w "${branch#remotes/origin/}") ]]; then
if git branch | grep -qw "${branch#remotes/origin/}"; then
# hack to force creating a new branch which tracks the remote if a local branch already exists
git checkout -b "track/${branch#remotes/origin/}" --track "$branch"
elif ! git checkout --track "$branch" 2>/dev/null; then