utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix the checkout branch...

Browse source 
...when a local branch exists and contains slashes in its name.
This commit is contained in:
crazy-matt 2021-08-31 22:20:18 +01:00 committed by GitHub
parent 9f3a423920
commit 6620e1347c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
forgit.plugin.zsh
View file

@ -229,8 +229,16 @@ 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 ! git checkout --track "$branch" 2>/dev/null; then
if [[ "$branch" == "remotes/origin/"* ]]; then
if [[ -n $(git branch | grep -w "${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
git checkout "$branch"
fi
else
git checkout "$branch"
fi
}