@aspruyt/json-config-sync 3.9.0 → 3.10.1

package/README.md

@@ -540,7 +540,7 @@ repos:
 
 ### Executable Files
 
-Shell scripts (`.sh` files) are automatically marked as executable using `git update-index --chmod=+x`. You can control this behavior:
+Shell scripts (`.sh` files) are automatically marked as executable using `git update-index --add --chmod=+x`. You can control this behavior:
 
 ```yaml
 files:

package/dist/git-ops.js

@@ -115,7 +115,7 @@ export class GitOps {
         const filePath = this.validatePath(fileName);
         // Use relative path from workDir for git command
         const relativePath = relative(this.workDir, filePath);
-        await this.exec(`git update-index --chmod=+x ${escapeShellArg(relativePath)}`, this.workDir);
+        await this.exec(`git update-index --add --chmod=+x ${escapeShellArg(relativePath)}`, this.workDir);
     }
     /**
      * Checks if writing the given content would result in changes.

package/dist/index.js

@@ -26,14 +26,14 @@ program
     .option("-w, --work-dir <path>", "Temporary directory for cloning", "./tmp")
     .option("-r, --retries <number>", "Number of retries for network operations (0 to disable)", (v) => parseInt(v, 10), 3)
     .option("-b, --branch <name>", "Override the branch name (default: chore/sync-{filename} or chore/sync-config)")
-    .option("-m, --merge <mode>", "PR merge mode: manual (default), auto (merge when checks pass), force (bypass requirements)", (value) => {
+    .option("-m, --merge <mode>", "PR merge mode: manual, auto (default, merge when checks pass), force (bypass requirements)", (value) => {
     const valid = ["manual", "auto", "force"];
     if (!valid.includes(value)) {
         throw new Error(`Invalid merge mode: ${value}. Valid: ${valid.join(", ")}`);
     }
     return value;
 })
-    .option("--merge-strategy <strategy>", "Merge strategy: merge (default), squash, rebase", (value) => {
+    .option("--merge-strategy <strategy>", "Merge strategy: merge, squash (default), rebase", (value) => {
     const valid = ["merge", "squash", "rebase"];
     if (!valid.includes(value)) {
         throw new Error(`Invalid merge strategy: ${value}. Valid: ${valid.join(", ")}`);

package/dist/repository-processor.js

@@ -143,14 +143,14 @@ export class RepositoryProcessor {
                 retries,
             });
             // Step 10: Handle merge options if configured
-            const mergeMode = repoConfig.prOptions?.merge ?? "manual";
+            const mergeMode = repoConfig.prOptions?.merge ?? "auto";
             let mergeResult;
             if (prResult.success && prResult.url && mergeMode !== "manual") {
                 this.log.info(`Handling merge (mode: ${mergeMode})...`);
                 const mergeConfig = {
                     mode: mergeMode,
-                    strategy: repoConfig.prOptions?.mergeStrategy,
-                    deleteBranch: repoConfig.prOptions?.deleteBranch,
+                    strategy: repoConfig.prOptions?.mergeStrategy ?? "squash",
+                    deleteBranch: repoConfig.prOptions?.deleteBranch ?? true,
                     bypassReason: repoConfig.prOptions?.bypassReason,
                 };
                 const result = await mergePR({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/json-config-sync",
-  "version": "3.9.0",
+  "version": "3.10.1",
   "description": "CLI tool to sync JSON or YAML configuration files across multiple GitHub and Azure DevOps repositories",
   "type": "module",
   "main": "dist/index.js",