used associative array to prevent unnecessary rebasing which messes up everything

Author: feefladder

git-linearize

@@ -233,17 +233,16 @@ function cmd_linearize() {
 	pre_branch=$(git branch --show-current)
 
 	if $EL_REBASE_SPLITS; then
-		split_commits=()
+		declare -A split_commit_map
 		for branch in $(git for-each-ref --format="%(refname:short)" refs/heads/); do
 			if [ $branch == $pre_branch ]; then
 				continue
 			fi
 			# merge_base=$(git merge-base "${commits[0]}" "$branch")
 			merge_base=$(git merge-base $pre_branch $branch)
 			echodebug "Found merge base $merge_base for branch $branch"
-			split_commits+=("$merge_base")
+			split_commit_map["$merge_base"]="$branch"
 		done
-		echodebug "Split commits: ${split_commits[*]}"
 	fi
 
 	# Find start commit
@@ -292,20 +291,17 @@ function cmd_linearize() {
 			echoinfo "[x] $sha1 is now $new_sha"
 
 			if $EL_REBASE_SPLITS; then
-				if [[ " ${split_commits[*]} " =~ " ${sha1} " ]]; then
+				# https://stackoverflow.com/a/46243464/14681457
+				if [[ -n "${split_commit_map[$sha1]+unset}" ]]; then
 					# List all branches that share this commit
 					# Then loop through them and rebase them onto the new commit.
-					echodebug "branches $EL_REBASE_SPLITS that contain this commit: $(git branch --contains $sha1)"
-					for branch in $(git branch --contains $sha1); do
-						if [ $branch != $pre_branch ]; then
-							echodebug "rebasing $branch onto $new_sha"
-							git switch $branch | debug
-							git rebase --onto $new_sha $sha1 | debug
-							git switch extremely-linear | debug
-						fi
-					done
+					branch=${split_commit_map[$sha1]}
+					git switch $branch | debug
+					git rebase --onto $new_sha $sha1 | debug
+					git switch extremely-linear | debug
 				else
-					echo "$sha1 not in $split_commits"
+					# echo "$sha1 not in ${split_commit_map[*]}"
+					printf "$sha1 not in %s\n" "${!split_commit_map[@]}" | debug
 				fi
 			fi
 		fi # skip if hash is already nice

testytest.sh

@@ -10,6 +10,9 @@ make_dummy_commit
 make_dummy_commit
 git switch main
 make_dummy_commit
+git checkout -b branch-2
+make_dummy_commit
+git switch main
 make_dummy_commit
 # a-b-e-f main
 #   \
@@ -26,4 +29,4 @@ else
   echo "nay! $(git merge-base main new-branch)"
 fi
 
-# git log --graph --all
+git log --graph --all