fix: simplify logic by propagating arg handling

Author: suft

bin/git-forgit

@@ -65,6 +65,18 @@ _forgit_previous_commit() {
     fi
 }
 
+_forgit_all_non_flags() {
+    while (("$#")); do
+        case "$1" in
+        -*)
+            return 1
+            ;;
+        esac
+        shift
+    done
+    return 0
+}
+
 _forgit_contains_non_flags() {
     while (("$#")); do
         case "$1" in
@@ -1216,6 +1228,16 @@ _forgit_worktree_select() {
     echo "$tree"
 }
 
+_forgit_worktree_lock_max_args() {
+    local usage
+    usage=$(git worktree lock --help 2>/dev/null | grep -E 'usage: git worktree lock' | head -n1)
+    usage=${usage#*:}
+     rest=$(echo "$usage" | awk '{for(i=4;i<=NF;++i)printf "%s ",$i; print ""}')
+    # shellcheck disable=SC2206
+    local args=($rest)
+    echo "${#args[@]}"
+}
+
 _forgit_git_worktree_lock() {
     _forgit_worktree_lock_git_opts=()
     _forgit_parse_array _forgit_worktree_lock_git_opts "$FORGIT_WORKTREE_LOCK_GIT_OPTS"
@@ -1225,21 +1247,12 @@ _forgit_git_worktree_lock() {
 _forgit_worktree_lock() {
     _forgit_inside_work_tree || _forgit_inside_git_dir || return 1
 
-    local tree opts reason
-    if [[ $# -ne 0 ]]; then
-        if [[ "$1" == "--reason" ]]; then
-            if [[ -z "$2" ]]; then
-                _forgit_warn "Option \`--reason' requires a value"
-                return 1
-            fi
-            reason="$2"
-            shift 2
-        fi
+    local tree opts max_args
+    max_args=$(_forgit_worktree_lock_max_args)
 
-        if [[ $# -eq 0 ]] || _forgit_contains_non_flags "$@"; then
-            git worktree lock "$@" --reason "$reason"
-            return $?
-        fi
+    if [[ $# -ge "$max_args" ]] || { [[ $# -ne 0 ]] && _forgit_all_non_flags "$@"; }; then
+        git worktree lock "$@"
+        return $?
     fi
 
     opts="
@@ -1251,12 +1264,7 @@ _forgit_worktree_lock() {
 
     tree=$(git worktree list | grep -vE "\(bare\)|locked" | awk '{print $1}' | FZF_DEFAULT_OPTS="$opts" fzf)
     [[ -z "$tree" ]] && return 1
-
-    if [[ -z "$reason" ]]; then
-        _forgit_git_worktree_lock "$tree"
-    else
-        _forgit_git_worktree_lock "$tree" --reason "$reason"
-    fi
+    _forgit_git_worktree_lock "$tree" "$@"
 }
 
 _forgit_git_worktree_remove() {
@@ -1267,28 +1275,11 @@ _forgit_git_worktree_remove() {
 
 _forgit_worktree_remove() {
     _forgit_inside_work_tree || _forgit_inside_git_dir || return 1
-    local worktree_list tree opts force_flags
-
-    force_flags=()
-
-    while (("$#")); do
-        case "$1" in
-        -f | --force)
-            force_flags+=("$1")
-            shift
-            ;;
-        -*) shift ;;
-        *)
-            tree="$1"
-            shift
-            ;;
-        esac
-    done
+    local worktree_list tree opts
 
-    if [[ -n "$tree" ]]; then
-        _forgit_git_worktree_remove "${force_flags[@]}" "$tree"
-        worktree_remove_status=$?
-        return $worktree_remove_status
+    if [[ $# -ne 0 ]] && _forgit_contains_non_flags "$@"; then
+        git worktree remove "$@"
+        return $?
     fi
 
     worktree_list=$(git worktree list | grep -v "(bare)")
@@ -1305,7 +1296,7 @@ _forgit_worktree_remove() {
 
     tree=$(echo "$worktree_list" | awk '{print $1}' | FZF_DEFAULT_OPTS="$opts" fzf)
     [[ -z "$tree" ]] && return 1
-    _forgit_git_worktree_remove "${force_flags[@]}" "$tree"
+    _forgit_git_worktree_remove "$tree" "$@"
 }
 
 _forgit_worktree_unlock() {