Merge branch 'hotfix/v5.39.X'

Author: tomgrv

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 # Changelog
 
+## 5.39.2 (2026-03-25)
+
+_Commits from: v5.39.1..HEAD_
+
+### 📦 common-utils changes
+
+#### Bug Fixes
+
+- 🐛 remove unused preserve function and simplify parameter handling ([a04b680](https://github.com/tomgrv/devcontainer-features/commit/a04b680f7612f4ae4f4661d59643d0815008f312))
+
+### 📦 gitutils changes
+
+#### Bug Fixes
+
+- 🐛 correct push logic and cleanup temporary branch handling ([4b8eaaa](https://github.com/tomgrv/devcontainer-features/commit/4b8eaaa1053f40a028fb4f4c2d6ffec098c4e66e))
+
+### 📦 gitversion changes
+
+#### Bug Fixes
+
+- 🐛 add docker-in-docker to installsAfter list ([fdceec5](https://github.com/tomgrv/devcontainer-features/commit/fdceec5be65f5d5d624be4b06741bc74a3836a38))
+
 ## 5.39.1 (2026-03-24)
 
 _Commits from: v5.39.0..HEAD_
@@ -639,4 +661,4 @@ _Commits from: v5.25.0..HEAD_
 
 ---
 
-_Generated on 2026-03-24 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_
+_Generated on 2026-03-25 by [tomgrv/devcontainer-features](https://github.com/tomgrv/devcontainer-features)_

package-lock.json

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

package.json

@@ -25,12 +25,6 @@ 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}")
@@ -61,10 +55,10 @@ echo $(preserve $params)
 
 if [ -x "${target}" ]; then
     zz_log i "Dispatching to executable target: ${target}" >&2
-    exec "${target}" $(preserve $params)
+    exec "${target}" $(echo $@)
 elif [ -f "${target}" ]; then
     zz_log i "Dispatching to subshell target: ${target}" >&2
-    exec sh "${target}" $(preserve $params)
+    exec sh "${target}" $(echo $@)
 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.39.1",
+    "version": "5.39.2",
     "dependsOn": {
         "ghcr.io/devcontainers/features/common-utils": {}
     },

src/common-utils/devcontainer-feature.json

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

src/common-utils/package.json

@@ -141,18 +141,15 @@ zz_log i "Fast-forwarding '$target' branch"
 if ! git checkout "$target"; then
 	zz_log e "Failed to checkout '$target' branch"
 	exit 1
-elif [ -n "$push" ] &&! git push origin "$target"; then
-	zz_log e "Failed to push '$target' branch to remote"
-	exit 1
 fi
 
 if ! git merge --ff-only "$temp"; then
 	zz_log e "Failed to fast-forward '$target' branch"
-	# Cleanup temp branch
-	git branch -D "$temp" 2>/dev/null
+	exit 1
+elif [ -n "$push" ] && ! git push origin "$target"; then
+	zz_log e "Failed to push '$target' branch to remote"
 	exit 1
 else
-	# Cleanup temporary branch
 	zz_log i "Cleaning up temporary branch"
 	git branch -D "$temp"
 fi

src/gitutils/_git-fix-base.sh

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

src/gitutils/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "name": "@tomgrv/gitutils",
-    "version": "5.39.0",
+    "version": "5.39.2",
     "description": "Git utilities and aliases for development workflow",
     "files": [
         "_*.sh",

src/gitutils/package.json

@@ -2,13 +2,14 @@
     "id": "gitversion",
     "name": "GitVersion feature",
     "description": "Add gitversion to your devcontainer",
-    "version": "5.38.6",
+    "version": "5.39.2",
     "dependsOn": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": "",
         "ghcr.io/tomgrv/devcontainer-features/common-utils:5": ""
     },
     "installsAfter": [
         "ghcr.io/tomgrv/devcontainer-features/common-utils",
+        "ghcr.io/devcontainers/features/docker-in-docker",
         "ghcr.io/devcontainers/features/dotnet"
     ],
     "options": {