@san-siva/gitsy 1.0.6 → 1.0.7

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
@@ -106,8 +106,8 @@ format_diff_output() {
 			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}')
+			local adds=$(git diff --numstat "origin/${target_branch}..${source_branch}" -- "$current_file" | awk '{print $1}')
+			local dels=$(git diff --numstat "origin/${target_branch}..${source_branch}" -- "$current_file" | awk '{print $2}')
 			if [ -n "$adds" ] && [ -n "$dels" ]; then
 				echo "${BLUE}stats:${NC} ${GREEN}+${adds}${NC} ${RED}-${dels}${NC}"
 			fi
@@ -143,7 +143,7 @@ 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() {
@@ -162,7 +162,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 +179,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 +190,7 @@ 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=$(git diff --stat "origin/${target_branch}..${source_branch}")
 		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}"

package/bin/g-wa

@@ -159,6 +159,16 @@ 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=$(get_current_branch)
+	local repo_name=$(get_repo_name)
+	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
+
 	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))
@@ -419,22 +429,7 @@ main() {
 	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/package.json

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