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

Provide an input branch with gcp again (#252)

Browse source 
Noticed there was a change recently that broke the ability to pass in an input branch to gcp.

This change is the following:

    Fix faulty logic that just led to a git checkout -b being called when you pass in an argument to gcp
    If an argument was passed in, check if it is a valid branch, if so, set the input_branch var
    If input_branch is set, use it to do the cherry pick, as opposed to the first FZF selection.
This commit is contained in:
Chris Apple 2022-12-13 16:42:07 -07:00 committed by GitHub
parent bfea8cf485
commit 62cc8abde1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bin/git-forgit
View file

@ -247,8 +247,11 @@ _forgit_cherry_pick() {
_forgit_cherry_pick_from_branch() {
_forgit_inside_work_tree || return 1
[[ $# -ne 0 ]] && { git checkout -b "$@"; return $?; }
local cmd preview opts branch exitval
local cmd preview opts branch exitval input_branch args
args=("$@")
if [[ $# -ne 0 ]]; then
input_branch=${args[0]}
fi
cmd="git branch --color=always --all | LC_ALL=C sort -k1.1,1.1 -rs"
preview="git log {1} $_forgit_log_preview_options"
opts="
@ -261,13 +264,19 @@ _forgit_cherry_pick_from_branch() {
# picked has been selected from within a branch
while true
do
branch="$(eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf | awk '{print $1}')"
if [[ -z $input_branch ]]; then
branch="$(eval "$cmd" | FZF_DEFAULT_OPTS="$opts" fzf | awk '{print $1}')"
else
branch=$input_branch
fi
unset input_branch
[[ -z "$branch" ]] && return 1
_forgit_cherry_pick "$branch"
exitval=$?
[[ $exitval != 130 ]] && return $exitval
[[ $exitval != 130 ]] || [[ $# -ne 0 ]] && return $exitval
done
}