elifarley
diff --git a/‎git-config/bin/git-bc‎
Lines changed: 51 additions & 45 deletions b/‎git-config/bin/git-bc‎
Lines changed: 51 additions & 45 deletions
diff --git a/‎git-config/bin/git-bdel‎
Lines changed: 4 additions & 7 deletions b/‎git-config/bin/git-bdel‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎git-config/bin/git-bdel-backup‎
Lines changed: 62 additions & 33 deletions b/‎git-config/bin/git-bdel-backup‎
Lines changed: 62 additions & 33 deletions
@@ -12,36 +12,36 @@ show_help() {
 hug bc: Create a new branch and switch to it
 
 USAGE:
-    hug bc [<branch-name>] [--point-to <commitish>] [-h, --help]
-    hug bc [--point-to <commitish>] [<branch-name>] [-h, --help]
+    hug bc [<branch-name>] [-t, --point-to <commitish>] [--no-switch] [-h, --help]
+    hug bc [-t, --point-to <commitish>] [<branch-name>] [--no-switch] [-h, --help]
 
 ARGUMENTS:
-    <branch-name>      Name for the new branch (optional with --point-to)
+    <branch-name>      Name for the new branch (optional with -t/--point-to)
 
 OPTIONS:
-    --point-to <commitish>   Create branch pointing to a specific commit, tag, or branch
-                             If specified without a branch name, generates one automatically
-    --no-switch              Create branch without switching to it
-    -h, --help               Show this help
+    -t, --point-to <commitish>   Create branch pointing to a specific commit, tag, or branch
+                                 If specified without a branch name, generates one automatically
+    --no-switch                  Create branch without switching to it
+    -h, --help                   Show this help
 
 DESCRIPTION:
     Creates a new branch and switches to it. By default, creates from the current HEAD.
     
-    With --point-to, you can create a branch from any commit, tag, or branch.
-    When --point-to is used without a branch name, automatically generates a name:
+    With -t/--point-to, you can create a branch from any commit, tag, or branch.
+    When -t/--point-to is used without a branch name, automatically generates a name:
     - If target is a branch: <branch>.copy.<iso-datetime>
     - If target is not a branch: <target>.branch.<iso-datetime>
     
     The ISO datetime format is YYYYMMDD-HHMM (e.g., 20251109-1430).
 
 EXAMPLES:
     hug bc new-feature                      # Create branch from current HEAD
-    hug bc --point-to abc123 my-feature     # Create branch from commit abc123
-    hug bc --point-to v1.0.0                # Auto-generate name from tag
-    hug bc --point-to main                  # Auto-generate name from branch
-    hug bc my-feature --point-to abc123     # Flag can come after branch name
+    hug bc -t abc123 my-feature             # Create branch from commit abc123
+    hug bc -t v1.0.0                        # Auto-generate name from tag
+    hug bc -t main                          # Auto-generate name from branch
+    hug bc my-feature -t abc123             # Flag can come after branch name
     hug bc --no-switch backup-branch        # Create without switching
-    hug bc --no-switch --point-to v1.0.0    # Auto-generate and create without switching
+    hug bc --no-switch -t v1.0.0            # Auto-generate and create without switching
 
 SEE ALSO:
     hug b      Switch to an existing branch
@@ -53,59 +53,69 @@ FURTHER READING:
 EOF
 }
 
-# Check for help flag first
-for arg in "$@"; do
-    if [[ "$arg" == "-h" || "$arg" == "--help" ]]; then
-        show_help
-        exit 0
-    fi
-done
-
 check_git_repo
 
-# Parse arguments
+# Parse arguments using getopt
+set +e  # Temporarily disable exit on error to capture getopt failure
+PARSED=$(getopt --options ht: --longoptions help,point-to:,no-switch --name "hug bc" -- "$@" 2>&1)
+getopt_status=$?
+set -e  # Re-enable exit on error
+
+if [ $getopt_status -ne 0 ]; then
+  # getopt failed - print the error message if available
+  if [ -n "$PARSED" ]; then
+    echo "$PARSED" >&2
+  fi
+  exit 1
+fi
+
+eval set -- "$PARSED"
+
+# Initialize variables
 branch_name=""
 point_to=""
 no_switch=false
-while [[ $# -gt 0 ]]; do
+
+# Process options
+while true; do
     case "$1" in
-        --point-to)
-            if [[ $# -lt 2 ]]; then
-                error "--point-to requires a commitish argument"
-            fi
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        -t|--point-to)
+            validate_commitish "-t/--point-to" "$2"
             point_to="$2"
             shift 2
             ;;
         --no-switch)
             no_switch=true
             shift
             ;;
-        -*)
-            error "Unknown option: $1. See 'hug bc --help'."
+        --)
+            shift
+            break
             ;;
         *)
-            if [[ -z "$branch_name" ]]; then
-                branch_name="$1"
-            else
-                error "Too many arguments. Expected one branch name. See 'hug bc --help'."
-            fi
-            shift
+            error "Internal error in option parsing"
             ;;
     esac
 done
 
+# Collect branch name from remaining arguments
+if [[ $# -gt 1 ]]; then
+    error "Too many arguments. Expected one branch name. See 'hug bc --help'."
+elif [[ $# -eq 1 ]]; then
+    branch_name="$1"
+fi
+
 # If no branch name and no point-to, error
 if [[ -z "$branch_name" && -z "$point_to" ]]; then
     error "Branch name is required. See 'hug bc --help'."
 fi
 
 # If point-to is specified without a branch name, generate one
 if [[ -n "$point_to" && -z "$branch_name" ]]; then
-    # Verify the target exists
-    if ! git rev-parse --verify --quiet "$point_to" >/dev/null 2>&1; then
-        error "Invalid commitish: $point_to"
-    fi
-    
     # Check if point_to is a branch name
     is_branch=false
     if git show-ref --verify --quiet "refs/heads/$point_to" 2>/dev/null; then
@@ -145,10 +155,6 @@ fi
 
 # Create and switch to the branch
 if [[ -n "$point_to" ]]; then
-    # Verify the target exists
-    if ! git rev-parse --verify --quiet "$point_to" >/dev/null 2>&1; then
-        error "Invalid commitish: $point_to"
-    fi
     if [[ "$no_switch" == true ]]; then
         git branch "$branch_name" "$point_to"
         info "Created branch '$branch_name' pointing to $point_to (use 'hug b $branch_name' to switch)"
 
@@ -12,7 +12,7 @@ show_help() {
 hug bdel: Delete one or more local branches safely
 
 USAGE:
-    hug bdel [<branch>...] [--dry-run] [-f, --force] [--quiet] [-h, --help]
+    hug bdel [<branch>...] [--dry-run] [-f, --force] [-q, --quiet] [-h, --help]
 
 ARGUMENTS:
     <branch>...        One or more branch names to delete
@@ -21,7 +21,7 @@ ARGUMENTS:
 OPTIONS:
     --dry-run          Preview the delete operation without applying changes
     -f, --force        Skip confirmation prompts and force delete unmerged branches
-    --quiet            Suppress output (sets HUG_QUIET=T)
+    -q, --quiet        Suppress output (sets HUG_QUIET=T)
     -h, --help         Show this help
 
 DESCRIPTION:
@@ -52,7 +52,7 @@ SEE ALSO:
 EOF
 }
 
-# Parse common flags (--dry-run, -f|--force, --quiet, -h|--help)
+# Parse common flags (--dry-run, -f|--force, -q|--quiet, -h|--help)
 eval "$(parse_common_flags "$@")"
 
 # Collect branch names
@@ -147,10 +147,7 @@ hug_bdel() {
       error "Cannot delete current branch '$current_branch'. Switch to another branch first."
     fi
 
-    # Validate that branch exists
-    if ! git rev-parse --verify "$branch" >/dev/null 2>&1; then
-      error "Branch '$branch' does not exist."
-    fi
+    validate_commitish "bdel argument" "$branch"
   done
 
   # Set dry_run default if not already set by parse_common_flags
 
@@ -12,7 +12,7 @@ show_help() {
 hug bdel-backup: Delete backup branches with filtering options
 
 USAGE:
-    hug bdel-backup [<backup-branch>...] [--keep N] [--delete-older-than PATTERN] [--dry-run] [-f, --force] [--quiet] [-h, --help]
+    hug bdel-backup [<backup-branch>...] [-k, --keep N] [-o, --delete-older-than PATTERN] [--dry-run] [-f, --force] [-q, --quiet] [-h, --help]
 
 ARGUMENTS:
     <backup-branch>... One or more backup branch names to delete
@@ -21,14 +21,14 @@ ARGUMENTS:
                        If not provided, shows interactive list for selection
 
 OPTIONS:
-    --keep N                Keep N most recent backup branches (delete the rest)
-    --delete-older-than P   Delete backups older than pattern P
-                            Patterns: YYYY, YYYY-MM, YYYY-MM/DD, YYYY-MM/DD-HH, YYYY-MM/DD-HHMM
-                            Example: --delete-older-than 2024-11 deletes backups from Nov 2024 and earlier
-    --dry-run               Preview the delete operation without applying changes
-    -f, --force             Skip confirmation prompts
-    --quiet                 Suppress output (sets HUG_QUIET=T)
-    -h, --help              Show this help
+    -k, --keep N                Keep N most recent backup branches (delete the rest)
+    -o, --delete-older-than P   Delete backups older than pattern P
+                                Patterns: YYYY, YYYY-MM, YYYY-MM/DD, YYYY-MM/DD-HH, YYYY-MM/DD-HHMM
+                                Example: -o 2024-11 deletes backups from Nov 2024 and earlier
+    --dry-run                   Preview the delete operation without applying changes
+    -f, --force                 Skip confirmation prompts
+    -q, --quiet                 Suppress output (sets HUG_QUIET=T)
+    -h, --help                  Show this help
 
 DESCRIPTION:
     Manages deletion of backup branches created by commands like 'hug rb'.
@@ -45,12 +45,12 @@ DESCRIPTION:
     apply --keep filter on the remaining backups.
 
 EXAMPLES:
-    hug bdel-backup                                    # Interactive: select backups to delete
+    hug bdel-backup                                   # Interactive: select backups to delete
     hug bdel-backup 2024-11/02-1234.feature           # Delete specific backup
-    hug bdel-backup --keep 5                          # Keep 5 most recent, delete rest
+    hug bdel-backup -k 5                              # Keep 5 most recent, delete rest
     hug bdel-backup --delete-older-than 2024-11       # Delete backups from Nov 2024 and earlier
     hug bdel-backup --delete-older-than 2024-11/03    # Delete backups from Nov 3, 2024 and earlier
-    hug bdel-backup --keep 3 --delete-older-than 2024 # Delete 2024 and earlier, then keep 3 most recent
+    hug bdel-backup -k 3 -o 2024                      # Delete 2024 and earlier, then keep 3 most recent
 
 SEE ALSO:
     hug bdel          Delete regular branches
@@ -59,45 +59,76 @@ SEE ALSO:
 EOF
 }
 
-# Parse custom flags
+# Parse all flags using getopt
 keep_count=""
 delete_older_than=""
 backup_branches_to_delete=()
 formatted_backups_to_delete=()  # Parallel array for display purposes
 
-# Parse common flags first
-eval "$(parse_common_flags "$@")"
+# Use getopt for parsing all options (common + custom)
+set +e  # Temporarily disable exit on error to capture getopt failure
+PARSED=$(getopt --options hfqk:o: --longoptions help,force,quiet,dry-run,keep:,delete-older-than: --name "hug bdel-backup" -- "$@" 2>&1)
+getopt_status=$?
+set -e  # Re-enable exit on error
 
-# Now parse remaining custom flags
-while [[ $# -gt 0 ]]; do
+if [ $getopt_status -ne 0 ]; then
+  # getopt failed - print the error message if available
+  if [ -n "$PARSED" ]; then
+    echo "$PARSED" >&2
+  fi
+  exit 1
+fi
+
+eval set -- "$PARSED"
+
+# Initialize common flag variables
+dry_run=false
+force=false
+
+# Process all options
+while true; do
   case "$1" in
-    --keep)
-      if [[ -z "${2:-}" ]]; then
-        error "--keep requires a number argument"
-      fi
+    -h|--help)
+      show_help
+      exit 0
+      ;;
+    -f|--force)
+      force=true
+      export HUG_FORCE=true
+      shift
+      ;;
+    -q|--quiet)
+      export HUG_QUIET=T
+      shift
+      ;;
+    --dry-run)
+      dry_run=true
+      shift
+      ;;
+    -k|--keep)
       if ! [[ "$2" =~ ^[0-9]+$ ]]; then
-        error "--keep requires a positive integer, got: $2"
+        error "Option -k/--keep requires a positive integer argument, got: $2"
       fi
       keep_count="$2"
       shift 2
       ;;
-    --delete-older-than)
-      if [[ -z "${2:-}" ]]; then
-        error "--delete-older-than requires a pattern argument"
-      fi
+    -o|--delete-older-than)
       delete_older_than="$2"
       shift 2
       ;;
-    -*)
-      error "Unknown option: $1. See 'hug bdel-backup --help'."
+    --)
+      shift
+      break
       ;;
     *)
-      backup_branches_to_delete+=("$1")
-      shift
+      error "Internal error in option parsing"
       ;;
   esac
 done
 
+# Collect remaining arguments (backup branch names)
+backup_branches_to_delete=("$@")
+
 check_git_repo
 
 # Validate delete_older_than pattern if provided
@@ -302,9 +333,7 @@ hug_bdel_backup() {
 
     # Validate all branches exist
     for branch in "${backup_branches_to_delete[@]}"; do
-      if ! git rev-parse --verify "$branch" >/dev/null 2>&1; then
-        error "Backup branch '$branch' does not exist."
-      fi
+      validate_commitish "bdel-backup argument" "$branch"
     done
 
     # Jump to deletion logic (skip interactive mode)