fix

check_dependent_project.sh

@@ -342,9 +342,7 @@ declare -A companion_branch_override
 companion_branch_override=()
 detect_companion_branch_override() {
   local line="$1"
-  echo "debug consider line $line"
   if [[ "$line" =~ ^[[:space:]]*([^[:space:]]+)[[:space:]]+companion[[:space:]]+branch:[[:space:]]*([^[:space:]]+) ]]; then
-    echo "debug line ${BASH_REMATCH[1]} ${BASH_REMATCH[2]}"
     companion_branch_override["${BASH_REMATCH[1]}"]="${BASH_REMATCH[2]}"
   fi
 }
@@ -500,6 +498,7 @@ main() {
     elif [ "${companion_branch_override[$dependent_repo]:-}" ]; then
       echo "Cloning dependent $dependent_repo with branch ${companion_branch_override[$dependent_repo]} from manual override"
       dependent_clone_options+=("--branch" "${companion_branch_override[$dependent_repo]}")
+      has_overridden_dependent_repo_ref=true
     else
       for override in "${companion_overrides[@]}"; do
         local this_repo_override this_repo_override_prefix dependent_repo_override dependent_repo_override_prefix
@@ -592,9 +591,6 @@ main() {
         dependent_clone_options+=("$branch_name")
 
         echo "Setting up the clone of $dependent_repo with options: ${dependent_clone_options[*]}"
-
-        # when a ref is matched through --companion-overrides, don't merge
-        # master into the branch in order to avoid disturbing its state
         has_overridden_dependent_repo_ref=true
 
         break