@san-siva/gitsy 1.0.6 → 1.0.8

package/bin/g-db

@@ -70,7 +70,8 @@ delete_local_branch() {
 		return 0
 	fi
 
-	current_branch=$(get_current_branch)
+	local current_branch
+	get_current_branch current_branch
 	if [ "${branch}" = "${current_branch}" ]; then
 		print_message "" -1
 		print_message "${RED}Cannot delete the branch you are currently on.${NC}" -1

package/bin/g-diff

@@ -96,7 +96,7 @@ format_diff_output() {
 	local skip_next_line=false
 
 	# Process git diff output line by line
-	git diff "${source_branch}..origin/${target_branch}" | while IFS= read -r line; do
+	git diff "origin/${target_branch}..${source_branch}" | while IFS= read -r line; do
 		if [[ "$line" =~ ^diff\ --git\ a/(.+)\ b/(.+)$ ]]; then
 			# New file section
 			if [ -n "$current_file" ]; then
@@ -105,11 +105,16 @@ format_diff_output() {
 			current_file="${BASH_REMATCH[1]}"
 			echo "${BLUE}file:${NC} ${current_file}"
 
-			# Get stats for this file
-			local adds=$(git diff --numstat "${source_branch}..origin/${target_branch}" -- "$current_file" | awk '{print $1}')
-			local dels=$(git diff --numstat "${source_branch}..origin/${target_branch}" -- "$current_file" | awk '{print $2}')
-			if [ -n "$adds" ] && [ -n "$dels" ]; then
-				echo "${BLUE}stats:${NC} ${GREEN}+${adds}${NC} ${RED}-${dels}${NC}"
+				# Get stats for this file
+			local adds dels numstat_output
+			numstat_output=$(git diff --numstat "origin/${target_branch}..${source_branch}" -- "$current_file" 2>&1)
+			local numstat_exit=$?
+			if [ $numstat_exit -eq 0 ]; then
+				adds=$(echo "$numstat_output" | awk '{print $1}')
+				dels=$(echo "$numstat_output" | awk '{print $2}')
+				if [ -n "$adds" ] && [ -n "$dels" ]; then
+					echo "${BLUE}stats:${NC} ${GREEN}+${adds}${NC} ${RED}-${dels}${NC}"
+				fi
 			fi
 			echo "${BLUE}changes:${NC}"
 			echo ""
@@ -143,18 +148,28 @@ format_diff_output() {
 }
 
 has_changes() {
-	! git diff --quiet "${source_branch}..origin/${target_branch}" 2>&1
+	! git diff --quiet "origin/${target_branch}..${source_branch}" 2>&1
 }
 
 show_full_diff() {
 	if has_changes; then
 		# Capture and display formatted output
-		local formatted_output=$(format_diff_output)
+		local formatted_output
+		formatted_output=$(format_diff_output)
+		local format_exit=$?
+		if [ $format_exit -ne 0 ]; then
+			print_message "" -1
+			print_message "${RED}Failed to format diff output. [Fail]${NC}" -1
+			return 1
+		fi
 		echo "$formatted_output" | indent
 
 		# Copy formatted output to clipboard (strip color codes)
-		local clipboard_content=$(sed $'s/\033\[[0-9;]*m//g' <<< "${formatted_output}")
-		copy_to_clipboard "$clipboard_content" "Formatted diff copied to clipboard."
+		local clipboard_content
+		clipboard_content=$(sed $'s/\033\[[0-9;]*m//g' <<< "${formatted_output}")
+		if [ $? -eq 0 ]; then
+			copy_to_clipboard "$clipboard_content" "Formatted diff copied to clipboard."
+		fi
 	else
 		print_message "${BLUE}No changes found between ${NC}${source_branch}${BLUE} and ${NC}${target_branch}${BLUE}.${NC}"
 	fi
@@ -162,7 +177,7 @@ show_full_diff() {
 
 show_files_only() {
 	local filenames
-	if ! filenames=$(git diff --name-only "${source_branch}..origin/${target_branch}" 2>&1); then
+	if ! filenames=$(git diff --name-only "origin/${target_branch}..${source_branch}" 2>&1); then
 		echo "$filenames" | indent
 		print_message "" -1
 		print_message "${RED}Failed to compare branches.${NC}" -1
@@ -179,7 +194,7 @@ show_files_only() {
 
 show_stat_summary() {
 	local result
-	if ! result=$(git -c color.ui=always diff --stat "${source_branch}..origin/${target_branch}" 2>&1); then
+	if ! result=$(git -c color.ui=always diff --stat "origin/${target_branch}..${source_branch}" 2>&1); then
 		echo "$result" | indent
 		print_message "" -1
 		print_message "${RED}Failed to compare branches.${NC}" -1
@@ -190,7 +205,12 @@ show_stat_summary() {
 		echo "$result" | indent
 
 		# Copy stats to clipboard (strip color codes)
-		local stats_content=$(git diff --stat "${source_branch}..origin/${target_branch}")
+		local stats_content
+		if ! stats_content=$(git diff --stat "origin/${target_branch}..${source_branch}" 2>&1); then
+			print_message "" -1
+			print_message "${RED}Failed to generate stats for clipboard. [Fail]${NC}" -1
+			return 1
+		fi
 		copy_to_clipboard "$stats_content" "Stats copied to clipboard."
 	else
 		print_message "${BLUE}No changes found between ${NC}${source_branch}${BLUE} and ${NC}${target_branch}${BLUE}.${NC}"
@@ -202,12 +222,7 @@ compare_branches() {
 
 	if [ -z "$source_branch" ]; then
 		print_message "${BLUE}Source branch not specified, using current branch...${NC}" $step_number
-		source_branch=$(get_current_branch true)
-		if [ -z "$source_branch" ]; then
-			print_message "" -1
-			print_message "${RED}Failed to get current branch.${NC}" -1
-			exit 1
-		fi
+		get_current_branch source_branch
 		step_number=$((step_number + 1))
 	fi
 

package/bin/g-pull

@@ -63,7 +63,7 @@ main() {
 	validate_dependencies
 	print_banner
 	if [ -z "$target_branch" ]; then
-		target_branch=$(get_current_branch)
+		get_current_branch target_branch
 	fi
 	if [ "$do_fetch" = "true" ]; then
 		print_message "${BLUE}Fetching changes...${NC}" 1

package/bin/g-push

@@ -65,7 +65,9 @@ main() {
 	validate_dependencies
 	print_banner
 	if [ -z "$target_branch" ]; then
-		push_changes $(get_current_branch) $should_force_push 1
+		local current_branch
+		get_current_branch current_branch
+		push_changes "$current_branch" $should_force_push 1
 		exit 0
 	fi
 	push_changes "$target_branch" $should_force_push 1

package/bin/g-rto

@@ -43,7 +43,7 @@ main() {
 	set_flags "$@"
 	validate_dependencies git figlet lolcat
 	print_banner
-	target_branch=$(get_current_branch)
+	get_current_branch target_branch
 	stash_changes true 1
 	print_message ""
 

package/bin/g-s

@@ -44,7 +44,8 @@ main() {
 	print_banner
 	print_message "${BLUE}Fetching git status...${NC}" 1
 
-	current_branch=$(get_current_branch)
+	local current_branch
+	get_current_branch current_branch
 
 	if ! git -c color.ui=always status 2>&1 | indent; then
 		print_message "${PROMPT}Failed to get git status. Are you in a git repository?${NC}"

package/bin/g-wa

@@ -66,8 +66,7 @@ set_flags() {
 }
 
 try_fetching_branch() {
-	fetch_success=$(fetch_changes "${target_branch}")
-	if [ "${fetch_success}" = "false" ]; then
+	if ! fetch_changes "${target_branch}"; then
 		print_message "" -1
 		print_message "${RED}Failed to fetch changes for branch ${target_branch}. [Fail]${NC}" -1
 		exit 1
@@ -81,7 +80,13 @@ check_branch_in_worktree() {
 	print_message "${BLUE}Checking if ${NC}${branch}${BLUE} branch exists...${NC}" $step_number
 
 	# Check if branch is already checked out in another worktree
-	local existing_worktree=$(git worktree list | grep "\[${branch}\]" | awk '{print $1}')
+	local existing_worktree
+	existing_worktree=$(git worktree list 2>/dev/null | grep -F "[${branch}]" | awk '{print $1}')
+	if [ $? -ne 0 ]; then
+		print_message "" -1
+		print_message "${RED}Failed to check worktree list. [Fail]${NC}" -1
+		exit 1
+	fi
 	if [ -n "$existing_worktree" ]; then
 		print_message "${RED}Branch ${NC}${branch}${RED} is already checked out in worktree:${NC}"
 		print_message "${GREEN}${existing_worktree}${NC}"
@@ -92,6 +97,7 @@ check_branch_in_worktree() {
 
 generate_worktree_path() {
 	local target_branch=$1
+	local -n result_var=$2
 
 	# Determine worktree directory based on current location
 	local worktree_dir
@@ -111,22 +117,50 @@ generate_worktree_path() {
 	fi
 
 	# Sanitize branch name for worktree directory
-	local worktree_name=$(sanitize_branch_name "$target_branch")
-	local path="${worktree_dir}${worktree_name}"
+	local worktree_name
+	sanitize_branch_name "$target_branch" worktree_name
+	if [ $? -ne 0 ]; then
+		return 1
+	fi
+	local result_path="${worktree_dir}${worktree_name}"
 
 	# Convert to absolute path
-	path=$(cd "$(dirname "$path")" 2>/dev/null && echo "$(pwd)/$(basename "$path")")
+	local abs_path
+	abs_path=$(cd "${result_path%/*}" 2>/dev/null && echo "$(pwd)/${result_path##*/}")
+	local abs_path_exit=$?
+	if [ $abs_path_exit -ne 0 ] || [ -z "$abs_path" ]; then
+		print_message "" -1
+		print_message "${RED}Failed to resolve absolute path. [Fail]${NC}" -1
+		return 1
+	fi
+	result_path="$abs_path"
 
 	# If path exists, generate a unique path
-	if [ -d "$path" ]; then
-		print_message "${RED}Worktree path already exists. [Fail]${NC}"
-		no_of_identical_dirs=$(find "$(dirname "$path")" -maxdepth 1 -type d -name "${worktree_name}*" 2>/dev/null | wc -l)
-		path="$(dirname "$path")/${worktree_name}_$(($no_of_identical_dirs + 1))"
-		print_message "${BLUE}Using new path: ${NC}${path}${NC}"
+	if [ -d "$result_path" ]; then
+		print_message "${PROMPT}Worktree path already exists.${NC}"
+		local parent_dir="${result_path%/*}"
+		local no_of_identical_dirs
+		no_of_identical_dirs=$(find "$parent_dir" -maxdepth 1 -type d -name "${worktree_name}*" 2>/dev/null | wc -l)
+		local find_exit=$?
+		if [ $find_exit -ne 0 ]; then
+			print_message "" -1
+			print_message "${RED}Failed to count existing directories. [Fail]${NC}" -1
+			return 1
+		fi
+		result_path="${parent_dir}/${worktree_name}_$(($no_of_identical_dirs + 1))"
+		print_message "${BLUE}Using new path: ${NC}${result_path}${NC}"
+
+		# Validate the new path
+		if [ -z "$result_path" ]; then
+			print_message "" -1
+			print_message "${RED}Failed to generate unique worktree path. [Fail]${NC}" -1
+			return 1
+		fi
 	fi
 
-	# Return the generated path
-	echo "$path"
+	# Set the result via nameref
+	result_var="$result_path"
+	return 0
 }
 
 checkout_or_create_branch() {
@@ -136,7 +170,13 @@ checkout_or_create_branch() {
 	check_branch_in_worktree "${target_branch}" $step_number
 
 	# Generate worktree path
-	local path=$(generate_worktree_path "${target_branch}" $step_number)
+	local path
+	generate_worktree_path "${target_branch}" path
+	if [ $? -ne 0 ]; then
+		print_message "" -1
+		print_message "${RED}Failed to generate worktree path. [Fail]${NC}" -1
+		exit 1
+	fi
 
 	# Check if branch exists locally
 	if git show-ref --verify --quiet "refs/heads/${target_branch}"; then
@@ -159,6 +199,22 @@ checkout_or_create_branch() {
 
 	print_message "${RED}Branch not found on remote.${NC}"
 
+	# Get current branch and repo info for the "Will create" message
+	local current_branch repo_name sanitized_target
+	get_current_branch current_branch
+	get_repo_name repo_name
+	sanitize_branch_name "$target_branch" sanitized_target
+	if [ $? -ne 0 ]; then
+		print_message "" -1
+		print_message "${RED}Failed to sanitize branch name. [Fail]${NC}" -1
+		exit 1
+	fi
+
+	print_message "" -1
+	print_message "${BLUE}Will create ${NC}${target_branch}${BLUE} worktree (cut from ${NC}${current_branch}${BLUE})${NC}" -1
+	print_message "Location: ${BLUE}${repo_name}/worktrees/${sanitized_target}${NC}" -1
+	print_message "" -1
+
 	create_new_branch=$(prompt_user true "Create new branch?" $((step_number + 2)))
 	if [ "${create_new_branch}" = "y" ]; then
 		print_message "${BLUE}Creating ${NC}${target_branch}${BLUE} worktree...${NC}" $((step_number + 3))
@@ -179,49 +235,46 @@ prompt_restructure_confirmation() {
 	local target_branch=$5
 
 	# Save the current branch before restructuring
-	local original_branch=$(get_current_branch)
-	if [ -z "$original_branch" ]; then
-		print_message "" -1
-		print_message "${RED}Failed to get current branch. [Fail]${NC}" -1
-		exit 1
-	fi
-	print_message "${step_number}. ${BLUE}Repository Reorganization Required${NC}" -1 >&2
-	print_message "Your repository will be moved into a 'main' subdirectory to enable worktree support" 0 >&2
-	print_message "" 0 >&2
-	print_message "Current location: ${BLUE}${git_root}${NC}" 0 >&2
-	print_message "New location:     ${BLUE}${git_root}/main${NC}" 0 >&2
-	print_message "Current branch:   ${BLUE}${original_branch}${NC}" 0 >&2
-	print_message "" 0 >&2
-	print_message "This structure allows you to work on multiple branches simultaneously" 0 >&2
-	print_message "by creating worktrees in separate directories" 0 >&2
+	local original_branch
+	get_current_branch original_branch
+	print_message "${step_number}. ${BLUE}Repository Reorganization Required${NC}" -1
+	print_message "Your repository will be moved into a 'main' subdirectory to enable worktree support" 0
+	print_message "" 0
+	print_message "Current location: ${BLUE}${git_root}${NC}" 0
+	print_message "New location:     ${BLUE}${git_root}/main${NC}" 0
+	print_message "Current branch:   ${BLUE}${original_branch}${NC}" 0
+	print_message "" 0
+	print_message "This structure allows you to work on multiple branches simultaneously" 0
+	print_message "by creating worktrees in separate directories" 0
 
 	# If not on default branch, mention worktree will be created
 	if [ "$original_branch" != "$default_branch" ]; then
-		local sanitized_original=$(sanitize_branch_name "$original_branch")
-		local sanitized_target=$(sanitize_branch_name "$target_branch")
-		print_message "" 0 >&2
-		print_message "Note: You're currently on ${BLUE}${original_branch}${NC} (not ${BLUE}${default_branch}${NC})" 0 >&2
+		local sanitized_original sanitized_target
+		sanitize_branch_name "$original_branch" sanitized_original
+		sanitize_branch_name "$target_branch" sanitized_target
+		print_message "" 0
+		print_message "Note: You're currently on ${BLUE}${original_branch}${NC} (not ${BLUE}${default_branch}${NC})" 0
 
 		# Check if target branch is the same as original branch
 		if [ "$target_branch" = "$original_branch" ]; then
-			print_message "Two directories will be created:" 0 >&2
-			print_message "" 0 >&2
-			print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0 >&2
-			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_original}${NC} → ${BLUE}${original_branch}${NC} branch" 0 >&2
+			print_message "Two directories will be created:" 0
+			print_message "" 0
+			print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0
+			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_original}${NC} → ${BLUE}${original_branch}${NC} branch" 0
 		else
-			print_message "Three directories will be created:" 0 >&2
-			print_message "" 0 >&2
-			print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0 >&2
-			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_original}${NC} → ${BLUE}${original_branch}${NC} branch" 0 >&2
-			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_target}${NC} → ${BLUE}${target_branch}${NC} branch (cut from ${BLUE}${original_branch}${NC})" 0 >&2
+			print_message "Three directories will be created:" 0
+			print_message "" 0
+			print_message "• ${BLUE}${repo_name}/main${NC} → ${BLUE}${default_branch}${NC} branch" 0
+			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_original}${NC} → ${BLUE}${original_branch}${NC} branch" 0
+			print_message "• ${BLUE}${repo_name}/worktrees/${sanitized_target}${NC} → ${BLUE}${target_branch}${NC} branch (cut from ${BLUE}${original_branch}${NC})" 0
 		fi
 	fi
 
 	# Prompt user for confirmation
 	local proceed=$(prompt_user false "Proceed with restructuring?" "$step_number")
 	if [ "$proceed" != "y" ]; then
-		print_message "" -1 >&2
-		print_message "${RED}Restructuring cancelled by user.${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Restructuring cancelled by user.${NC}" -1
 		exit 1
 	fi
 }
@@ -230,18 +283,19 @@ create_main_dir() {
 	local git_root=$1
 	local temp_dir=$2
 	local step_number=$3
+	local -n result_var=$4
 
 	# Create temp directory and move everything there
 	if ! mkdir -p "$temp_dir"; then
-		print_message "" -1 >&2
-		print_message "${RED}Failed to create temporary directory. [Fail]${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Failed to create temporary directory. [Fail]${NC}" -1
 		exit 1
 	fi
 
-	print_message "${BLUE}Moving repository contents to temporary location...${NC}" $step_number >&2
+	print_message "${BLUE}Moving repository contents to temporary location...${NC}" $step_number
 	if ! (shopt -s dotglob && mv "$git_root"/* "$temp_dir/" 2>&1); then
-		print_message "" -1 >&2
-		print_message "${RED}Failed to move contents to temporary directory. [Fail]${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Failed to move contents to temporary directory. [Fail]${NC}" -1
 		rm -rf "$temp_dir"
 		exit 1
 	fi
@@ -249,8 +303,8 @@ create_main_dir() {
 	# Create main directory
 	local main_dir="${git_root}/main"
 	if ! mkdir -p "$main_dir"; then
-		print_message "" -1 >&2
-		print_message "${RED}Failed to create main directory. [Fail]${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Failed to create main directory. [Fail]${NC}" -1
 		# Restore from temp
 		(shopt -s dotglob && mv "$temp_dir"/* "$git_root/")
 		rm -rf "$temp_dir"
@@ -259,15 +313,16 @@ create_main_dir() {
 
 	# Move everything from temp to main
 	if ! (shopt -s dotglob && mv "$temp_dir"/* "$main_dir/" 2>&1); then
-		print_message "" -1 >&2
-		print_message "${RED}Failed to move contents to main directory. [Fail]${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Failed to move contents to main directory. [Fail]${NC}" -1
 		exit 1
 	fi
 
 	# Clean up temp directory
 	rm -rf "$temp_dir"
 
-	echo "$main_dir"
+	result_var="$main_dir"
+	return 0
 }
 
 checkout_main_in_main_branch() {
@@ -306,7 +361,13 @@ checkout_current_branch() {
 		return 0
 	fi
 
-	local path=$(generate_worktree_path "$original_branch" $step_number)
+	local path
+	generate_worktree_path "$original_branch" path
+	if [ $? -ne 0 ]; then
+		print_message "" -1
+		print_message "${RED}Failed to generate worktree path. [Fail]${NC}" -1
+		exit 1
+	fi
 	print_message "${BLUE}Creating ${NC}${original_branch}${BLUE} worktree...${NC}" $step_number
 	create_worktree "$original_branch" "$path"
 
@@ -339,27 +400,31 @@ create_main_dir_if_necessary() {
 		step_number=0
 	fi
 
-	local git_root=$(git rev-parse --show-toplevel)
-	local current_dir=$(basename "$git_root")
-	local parent_dir=$(basename "$(dirname "$git_root")")
-	local repo_name=$(get_repo_name)
+	local git_root current_dir parent_dir repo_name
+	if ! get_repo_info git_root current_dir parent_dir repo_name; then
+		print_message "" -1
+		print_message "${RED}Failed to get repository information. [Fail]${NC}" -1
+		exit 1
+	fi
 
 	if already_restructured; then
 		return 0
 	fi
 
 	# Save original branch before restructuring
-	local original_branch=$(get_current_branch)
+	local original_branch
+	get_current_branch original_branch
 
 	# Prompt user for restructuring
 	prompt_restructure_confirmation "$git_root" "$repo_name" "$default_branch" "$step_number" "$target_branch"
 
 	# Get parent directory path
-	local parent_path=$(dirname "$git_root")
+	local parent_path="${git_root%/*}"
 	local temp_dir="${parent_path}/.temp-${repo_name}-$$"
 
 	# Create main directory and restructure
-	local main_dir=$(create_main_dir "$git_root" "$temp_dir" $((step_number + 1)))
+	local main_dir
+	create_main_dir "$git_root" "$temp_dir" $((step_number + 1)) main_dir
 
 	# Navigate to main directory using direct path
 	if ! navigate_to_dir "$main_dir"; then
@@ -400,8 +465,9 @@ main() {
 		exit 1
 	fi
 
-	local default_branch=$(get_default_branch)
-	local current_branch=$(get_current_branch)
+	local default_branch current_branch
+	get_default_branch default_branch
+	get_current_branch current_branch
 
 	local step_number=2
 	if [ "$stash" = true ]; then
@@ -409,32 +475,19 @@ main() {
 	fi
 
 	# Check if we need to restructure (to calculate proper step numbers)
-	local git_root=$(git rev-parse --show-toplevel)
-	local current_dir=$(basename "$git_root")
-	local parent_dir=$(basename "$(dirname "$git_root")")
-	local repo_name=$(get_repo_name)
+	local git_root current_dir parent_dir repo_name
+	if ! get_repo_info git_root current_dir parent_dir repo_name; then
+		print_message "" -1
+		print_message "${RED}Failed to get repository information. [Fail]${NC}" -1
+		exit 1
+	fi
 	create_main_dir_if_necessary "$default_branch" $step_number
 	local needs_restructure=$?
 
 	if [ $needs_restructure -eq 1 ]; then
 		checkout_or_create_branch $((step_number + 4))
 	else
-		# Notify user that worktree will be created
-		local sanitized_target=$(sanitize_branch_name "$target_branch")
-		print_message "" -1
-		print_message "${BLUE}Will create ${NC}${target_branch}${BLUE} worktree (cut from ${NC}${current_branch}${BLUE})${NC}" -1
-		print_message "Location: ${BLUE}${repo_name}/worktrees/${sanitized_target}${NC}" -1
-		print_message "" -1
-
-		# Prompt user for confirmation
-		local proceed=$(prompt_user false "Proceed with creating worktree?" "$step_number")
-		if [ "$proceed" != "y" ]; then
-			print_message "" -1
-			print_message "${RED}Worktree creation cancelled by user.${NC}" -1
-			exit 1
-		fi
-
-		checkout_or_create_branch $((step_number + 1))
+		checkout_or_create_branch $step_number
 	fi
 }
 

package/bin/g-wr

@@ -88,15 +88,21 @@ set_flags() {
 
 cd_to_worktrees_dir() {
 	# Get git root and navigate to repo root's worktrees directory
-	local git_root=$(git rev-parse --show-toplevel)
+	local git_root
+	git_root=$(git rev-parse --show-toplevel 2>&1)
+	if [ $? -ne 0 ] || [ -z "$git_root" ]; then
+		print_message "" -1
+		print_message "${RED}Failed to get git root directory. [Fail]${NC}" -1
+		exit 1
+	fi
 	local git_root_parent=$(dirname "$git_root")
 	local git_root_parent_name=$(basename "$git_root_parent")
 
 	# If we're in a worktree (parent is "worktrees"), use that directory
 	if [ "$git_root_parent_name" = "worktrees" ]; then
 		if ! navigate_to_dir "$git_root_parent"; then
-			print_message "" -1 >&2
-			print_message "${RED}Failed to navigate to worktrees directory. [Fail]${NC}" -1 >&2
+			print_message "" -1
+			print_message "${RED}Failed to navigate to worktrees directory. [Fail]${NC}" -1
 			exit 1
 		fi
 		return 0
@@ -105,14 +111,14 @@ cd_to_worktrees_dir() {
 	# Otherwise, we're in main, so look for ../worktrees
 	local worktrees_dir="$git_root_parent/worktrees"
 	if [ ! -d "$worktrees_dir" ]; then
-		print_message "" -1 >&2
-		print_message "${RED}Worktrees directory not found at ${NC}${worktrees_dir}${RED}. [Fail]${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Worktrees directory not found at ${NC}${worktrees_dir}${RED}. [Fail]${NC}" -1
 		exit 1
 	fi
 
 	if ! navigate_to_dir "$worktrees_dir"; then
-		print_message "" -1 >&2
-		print_message "${RED}Failed to navigate to worktrees directory. [Fail]${NC}" -1 >&2
+		print_message "" -1
+		print_message "${RED}Failed to navigate to worktrees directory. [Fail]${NC}" -1
 		exit 1
 	fi
 }
@@ -155,8 +161,10 @@ find_worktree_by_branch() {
 			continue
 		fi
 
-		local branch=$(get_current_branch 2>/dev/null)
-		if [ -z "$branch" ]; then
+		local branch
+		branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+		local branch_exit=$?
+		if [ $branch_exit -ne 0 ] || [ -z "$branch" ]; then
 			continue
 		fi
 
@@ -247,8 +255,9 @@ main() {
 		print_message "${BLUE}Searching for worktree with branch ${NC}${target_branch}${BLUE}...${NC}" $step_number
 	fi
 
+	local worktree_path
 	worktree_path=$(find_dir_to_remove)
-	if [ -z "$worktree_path" ]; then
+	if [ $? -ne 0 ] || [ -z "$worktree_path" ]; then
 		print_message "" -1
 		if [ -n "$worktree_name" ]; then
 			print_message "${RED}No worktree found with name ${NC}${worktree_name}${RED}. [Fail]${NC}" -1

package/bin/utils

@@ -116,56 +116,67 @@ prompt_user() {
 }
 
 get_current_branch() {
-	current_branch=$(git rev-parse --abbrev-ref HEAD)
-	if [ -z "$current_branch" ]; then
+	local -n result=$1
+	result=$(git rev-parse --abbrev-ref HEAD 2>&1)
+	local get_branch_exit=$?
+	if [ $get_branch_exit -ne 0 ] || [ -z "$result" ]; then
 		print_message "" -1
 		print_message "${RED}Failed to get current branch. [Fail]${NC}" -1
 		exit 1
 	fi
-	echo "${current_branch}"
+	return 0
 }
 
 get_default_branch() {
+	local -n result=$1
 	local default_branch=""
 
 	# Try to get from remote HEAD
 	default_branch=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
+	local exit_code=$?
 
-	if [ -n "$default_branch" ]; then
-		echo "$default_branch"
+	if [ $exit_code -eq 0 ] && [ -n "$default_branch" ]; then
+		result="$default_branch"
 		return 0
 	fi
 
 	# Check if main exists locally
 	if git show-ref --verify --quiet "refs/heads/main"; then
-		echo "main"
+		result="main"
 		return 0
 	fi
 
 	# Check if master exists locally
 	if git show-ref --verify --quiet "refs/heads/master"; then
-		echo "master"
+		result="master"
 		return 0
 	fi
 
 	# Fallback to main
-	echo "main"
+	result="main"
 	return 0
 }
 
 sanitize_branch_name() {
 	local branch_name=$1
-	local max_length=${2:-30}  # Default max length is 30
+	local -n result=$2
+	local max_length=${3:-30}  # Default max length is 30
 
 	# Replace non-alphanumeric characters with underscores and convert to lowercase
-	local sanitized=$(echo "$branch_name" | sed -E 's/[^[:alnum:]]/_/g' | tr '[:upper:]' '[:lower:]')
+	local sanitized
+	sanitized=$(echo "$branch_name" | sed -E 's/[^[:alnum:]]/_/g' | tr '[:upper:]' '[:lower:]')
+	local sanitize_exit=$?
+	if [ $sanitize_exit -ne 0 ]; then
+		return 1
+	fi
 
 	# Truncate if longer than max_length
 	if [ ${#branch_name} -gt $max_length ]; then
 		sanitized="${sanitized:0:$max_length}.."
 	fi
 
-	echo "$sanitized"
+	result="$sanitized"
+	return 0
 }
 
 stash_changes() {
@@ -187,7 +198,13 @@ stash_changes() {
 		fi
 
 		local stash_message
-		local branch_name=$(git rev-parse --abbrev-ref HEAD)
+		local branch_name
+		branch_name=$(git rev-parse --abbrev-ref HEAD 2>&1)
+		if [ $? -ne 0 ] || [ -z "$branch_name" ]; then
+			print_message "" -1
+			print_message "${RED}Failed to get current branch name for stash. [Fail]${NC}" -1
+			exit 1
+		fi
 		local stash_date=$(date '+%Y-%m-%d %H:%M:%S')
 
 		if [ -n "$tag_message" ]; then
@@ -276,12 +293,8 @@ create_worktree() {
 		exit 1
 	fi
 
-	base_branch=$(get_current_branch)
-	if [ -z "$base_branch" ]; then
-		print_message "" -1
-		print_message "${RED}Failed to get current branch. [Fail]${NC}" -1
-		exit 1
-	fi
+	local base_branch
+	get_current_branch base_branch
 
 	if [ "$new_branch" = "true" ]; then
 		# Make sure the source branch exists remotely!
@@ -436,7 +449,8 @@ already_on_branch() {
 		step_number=1
 	fi
 	print_message "${BLUE}Checking current branch...${NC}" $step_number
-	current_branch=$(get_current_branch)
+	local current_branch
+	get_current_branch current_branch
 	if [ "${target_branch}" = "${current_branch}" ]; then
 		print_message "${GREEN}Already on branch ${NC}${target_branch}${GREEN}. [DONE]${NC}"
 		exit 1
@@ -586,14 +600,49 @@ copy_to_clipboard() {
 }
 
 get_repo_name() {
+	local -n result=$1
+
 	# Try to get repo name from git remote
-	local remote_url=$(git config --get remote.origin.url 2>/dev/null)
+	local remote_url
+	remote_url=$(git config --get remote.origin.url 2>/dev/null)
 	if [ -n "$remote_url" ]; then
 		# Extract repo name from URL (handles both https and ssh)
-		echo "$remote_url" | sed -E 's#.*/([^/]+)(\.git)?$#\1#' | sed 's/\.git$//'
+		result=$(echo "$remote_url" | sed -E 's#.*/([^/]+)(\.git)?$#\1#' | sed 's/\.git$//')
+		local extract_exit=$?
+		if [ $extract_exit -ne 0 ]; then
+			return 1
+		fi
 		return 0
 	fi
 
 	# Fallback to directory name
-	basename "$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
+	local toplevel
+	toplevel=$(git rev-parse --show-toplevel 2>/dev/null || pwd)
+	result="${toplevel##*/}"
+	return 0
+}
+
+get_repo_info() {
+	local -n git_root_ref=$1
+	local -n current_dir_ref=$2
+	local -n parent_dir_ref=$3
+	local -n repo_name_ref=$4
+
+	# Get git root
+	git_root_ref=$(git rev-parse --show-toplevel)
+	local git_root_exit=$?
+	if [ $git_root_exit -ne 0 ] || [ -z "$git_root_ref" ]; then
+		return 1
+	fi
+
+	# Get current directory name (basename of git root)
+	current_dir_ref="${git_root_ref##*/}"
+
+	# Get parent directory (dirname of git root, then basename of that)
+	local parent_path="${git_root_ref%/*}"
+	parent_dir_ref="${parent_path##*/}"
+
+	# Get repo name
+	get_repo_name repo_name_ref
+	return 0
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@san-siva/gitsy",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "A set of bash utilities for managing Git repositories with ease",
   "keywords": [
     "git",