Merge branch 'release/5.39.0'

Author: tomgrv

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 # Changelog
 
+## 5.39.0 (2026-03-24)
+
+_Commits from: v5.38.7..HEAD_
+
+### 📂 Unscoped changes
+
+#### Other changes
+
+- Merge tag 'v5.38.0' into develop ([89bf33f](https://github.com/tomgrv/devcontainer-features/commit/89bf33ffb8577dfa4dcdde139c8d52ff3c2c24fb))
+- Merge tag 'v5.38.1' into develop ([76413d0](https://github.com/tomgrv/devcontainer-features/commit/76413d0b740863169e76ad9af283571c706b0716))
+- Merge tag 'v5.38.2' into develop ([7b1f14b](https://github.com/tomgrv/devcontainer-features/commit/7b1f14b3f4feb41517cf0f84d6e094538723db4c))
+- Merge tag 'v5.38.3' into develop ([1a61e91](https://github.com/tomgrv/devcontainer-features/commit/1a61e917ece3ccd6a8e066e93d2371e9a338a382))
+- Merge tag 'v5.38.4' into develop ([c7b55fe](https://github.com/tomgrv/devcontainer-features/commit/c7b55fe12e808ad1009f06764b4a4a8ba980926a))
+- Merge tag 'v5.38.5' into develop ([7ea28a2](https://github.com/tomgrv/devcontainer-features/commit/7ea28a2fd45eb0b6dd2ddb5fff0315bd2ee2a2cd))
+- Merge tag 'v5.38.6' into develop ([3f64400](https://github.com/tomgrv/devcontainer-features/commit/3f64400d096d1eb32ea052a7dd6baae94194d7e1))
+- Merge tag 'v5.38.7' into develop ([61267b0](https://github.com/tomgrv/devcontainer-features/commit/61267b03c238249ece036ad3bc71832b57a9c3b4))
+
+### 📦 common-utils changes
+
+#### Bug Fixes
+
+- 🐛 update argument prefix for params in dispatch utility ([b652d6e](https://github.com/tomgrv/devcontainer-features/commit/b652d6ed7bedb6ffe5691f658365b9ff62de684a))
+- 🐛 update argument processing for '=' and '+' parameters ([7820242](https://github.com/tomgrv/devcontainer-features/commit/7820242a71aab64bf5ab92b31fa6844bade179aa))
+
+### 📦 gitutils changes
+
+#### Bug Fixes
+
+- 🐛 add stash option to handle uncommitted changes before hotfix ([c48fe65](https://github.com/tomgrv/devcontainer-features/commit/c48fe65e7894ddf3cd9e06c5ee7680306950b51a))
+
+#### Features
+
+- ✨ add interactive branch deletion alias ([751a660](https://github.com/tomgrv/devcontainer-features/commit/751a66014166ff621b2f83aed1914e5a8be74e32))
+
 ## 5.38.7 (2026-03-24)
 
 _Commits from: v5.38.6..HEAD_

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/devcontainer-features",
-    "version": "5.38.7",
+    "version": "5.39.0",
     "description": "Configure dev environment with devcontainer, gitflow, gitversion, git aliases & hooks. Can be used a devcontainer features",
     "keywords": [
         "dev",

package.json

@@ -21,6 +21,12 @@ if test $# -lt 1; then
         <argname> <datatype> <varname> <help>
         ...
         help" >&2
+
+    echo "With <argname>:
+    x   for flags x with value (e.g., -f value, -h being reserved for help)
+    -   for sequential arguments in the order defined, without flags
+    +   to capture all remaining arguments as a single variable with spaces as separators
+    &   to capture all remaining arguments as a single variable with newlines as separators" >&2
     return 1
 fi
 
@@ -47,6 +53,9 @@ while read argname datatype varname help; do
     elif [ "$argname" = "+" ]; then
         line="<$datatype...>"
         helpinfo="$helpinfo\n\t$(printf '%-12s : %s' "$name" "$help")"
+    elif [ "$argname" = "&" ]; then
+        line="<$datatype...>>"
+        helpinfo="$helpinfo\n\t$(printf '%-12s : %s' "$name" "$help")"
     else
         if [ "$datatype" = "-" ]; then
             line="[-$argname]"
@@ -108,17 +117,25 @@ else
         fi
     done
 
-    # Process remaining '=' parameters
-    for arg in $(echo $varnames | grep -E "^=" | cut -f2); do
-        if [ "$#" -gt "0" ]; then
-            echo "$arg='$1'" && shift 1
-        fi
+    # Process remaining '&' parameters
+    for arg in $(echo $varnames | grep -E "^&" | cut -f2); do
+        lines=""
+        while [ "$#" -gt "0" ]; do
+            # spaces that are not escaped should be preserved as part of the argument
+            if [ -z "$lines" ]; then
+                lines="$1"
+            else
+                lines="$lines\\\\n$1"
+            fi
+            shift 1
+        done
+        echo "$arg='$lines'"  
     done
 
     # Process remaining '+' parameters
     for arg in $(echo $varnames | grep -E "^\+" | cut -f2); do
         if [ "$#" -gt "0" ]; then
-            echo "$arg='$(echo $@ | sed "s/ /\t/g")'" && shift $#
+            echo "$arg='$@'" && shift $#
         fi
     done
 

src/common-utils/_zz_args.sh

@@ -8,10 +8,11 @@ set -e
 
 # Parse arguments and display help if needed
 eval $(
-    zz_args "Dispatch Utility" $0 "$@" <<- help
+    ./src/common-utils/_zz_args.sh "Dispatch Utility" $0 "$@" <<- help
 		-   caller caller     Caller script path
         -   subcmd subcmd     Target script to execute
-        +   params params     Remaining arguments passed to the target script
+        d   debug  debug      Enable debug mode
+        &   params params     Remaining arguments passed to the target script
 	help
 )
 
@@ -24,6 +25,12 @@ usage() {
     fi
 }
 
+preserve() {
+    echo $@ | while read -r line; do
+        echo \"$line\" 
+    done
+}
+
 # Determine caller directory and base name
 caller_basename=$(basename "${caller}")
 caller_dir=$(dirname "${caller}")
@@ -38,8 +45,6 @@ if [ -z "${subcmd}" ]; then
     exit 1
 fi
 
-
-
 # If caller_dir is just the basename (no slash) and file exists in PATH, try to locate
 if [ "${caller_dir}" = "${caller_basename}" ] || [ -z "${caller_dir}" ]; then
     caller_dir="."
@@ -52,12 +57,14 @@ else
     target="${caller_dir}/${name}"
 fi
 
+echo $(preserve $params)
+
 if [ -x "${target}" ]; then
     zz_log i "Dispatching to executable target: ${target}" >&2
-    exec "${target}" $params
+    exec "${target}" $(preserve $params)
 elif [ -f "${target}" ]; then
     zz_log i "Dispatching to subshell target: ${target}" >&2
-    exec sh "${target}" $params
+    exec sh "${target}" $(preserve $params)
 else
     # Nothing found: show help and available utilities in the same directory
     zz_log w "No dispatch target found" && usage

src/common-utils/_zz_dispatch.sh

@@ -2,7 +2,7 @@
     "id": "common-utils",
     "name": "Common Utils",
     "description": "Common utils for tomgrv/devcontainer-features",
-    "version": "5.38.5",
+    "version": "5.39.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils": {}
     },

src/common-utils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/common-utils",
-    "version": "5.38.5",
+    "version": "5.39.0",
     "description": "Common utilities and helper scripts for devcontainer features",
     "files": [
         "_*.sh",

src/common-utils/package.json

@@ -75,13 +75,9 @@ fi
 # then reset develop branch to the main tag
 if [ -n "$rebase" ]; then
 
-    zz_log i "Rebasing: inverting develop and hotfix branches..."
+    zz_log i "Rebasing develop commits onto hotfix branch..."
+    git fix base -p hotfix/$hotfix develop
 
-    git fix base -p develop hotfix/"$current"
-    
-    # Return to hotfix branch
-    git checkout "hotfix/$current"
-    
-    zz_log s "Successfully inverted develop and hotfix branches"
 fi
 
+        

src/gitutils/_git-release-hotfix.sh

@@ -119,6 +119,10 @@
         "cmd": "git fetch --progress --prune --recurse-submodules=no origin && git stash save --keep-index --include-untracked && git merge --ff-only @{u} && git stash pop --index || git stash drop",
         "help": "Fetch, stash, fast-forward merge, and restore stash."
     },
+    "tidy": {
+        "cmd": "git branch --format=\"%(refname:short)\" | grep -v \"main\" |  grep -v \"dev\" | awk '{ printf(\"Delete %s? [y/n] \", $1); getline ans<\"/  dev/tty\"; if (ans == \"y\") { system(\"git branch -D \"$1 \">> ~/.gitdeletedbranches\"); } }'",
+        "help": "Interactively delete local branches except main and dev."
+    },
     "undo": {
         "cmd": "git reset --soft HEAD^ --",
         "help": "Undo last commit, keep changes staged."

src/gitutils/alias.json

@@ -2,7 +2,7 @@
     "id": "gitutils",
     "name": "Git Aliases",
     "description": "A feature to add useful Git aliases to your shell.",
-    "version": "5.38.7",
+    "version": "5.39.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/node:1": "lts",
         "ghcr.io/tomgrv/devcontainer-features/common-utils:5": {