Merge branch 'main' into storybook

iva2k · Jul 22, 2024 · a811f0c · a811f0c
2 parents 284ca84 + fa82a5d
commit a811f0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/scripts/git-merge_main-to-all-ui.sh b/scripts/git-merge_main-to-all-ui.sh
@@ -197,6 +197,10 @@ function parse_arguments() {
   #   usage
   #   exit 1
   # fi
+
+  # The rest are positional arguments (shift the processed options)
+  # shift $((OPTIND-1))
+  # positional_args=("$@")  
 }
 
 # alias decolor='sed "s/\x1B\[\([0-9]\{1,2\}\(;[0-9]\{1,2\}\)\?\)\?[mGK]//g"'
@@ -274,7 +278,7 @@ function merge_to_one() {
   is_continue="$1"
   i="$2"
   TARGET_BRANCH="${TARGET_BRANCHES[$i]}"
-  echo "${SEP2}" | tee -a "$LOGFILE"
+  echo "${SEP2}$TARGET_BRANCH " | tee -a "$LOGFILE"
   [ "$DEBUG" -ne 0 ] && echo "DEBUG: merge_to_one() is_continue=$is_continue i=$i TARGET_BRANCH=$TARGET_BRANCH"
   save_state  ;# checkpoint
 

diff --git a/scripts/git-run-all-in-branches.sh b/scripts/git-run-all-in-branches.sh
@@ -206,6 +206,10 @@ function parse_arguments() {
   #   usage
   #   exit 1
   # fi
+
+  # The rest are positional arguments (shift the processed options)
+  # shift $((OPTIND-1))
+  # positional_args=("$@")  
 }
 
 # alias decolor='sed "s/\x1B\[\([0-9]\{1,2\}\(;[0-9]\{1,2\}\)\?\)\?[mGK]//g"'
@@ -226,7 +230,7 @@ function run_one() {
   i="$1"
   TARGET_BRANCH="${TARGET_BRANCHES[$i]}"
   LOGFILE_I="$LOGFILE.$TARGET_BRANCH"
-  echo "${SEP2}" | tee -a "$LOGFILE"
+  echo "${SEP2}$TARGET_BRANCH " | tee -a "$LOGFILE"
   [ "$DEBUG" -ne 0 ] && echo "DEBUG: run_one() i=$i TARGET_BRANCH=$TARGET_BRANCH LOGFILE_I=$LOGFILE_I"
   save_state  ;# checkpoint