@panoptic-it-solutions/coolify-setup 1.1.21 → 1.1.23

package/dist/git.js

@@ -44,6 +44,8 @@ export async function commitAndPushToDevelop(files) {
     if (!isGitRepo()) {
         run('git init');
     }
+    // Save the original branch name before any operations
+    const originalBranch = run('git branch --show-current');
     // Stage all specified files (use -A to also stage deletions)
     for (const file of files) {
         try {
@@ -53,26 +55,19 @@ export async function commitAndPushToDevelop(files) {
             // File might not exist, that's ok
         }
     }
-    // Check if there are staged changes
+    // Check if there are staged changes and commit if so
+    let hasNewCommit = false;
     try {
         const status = run('git diff --cached --name-only');
-        if (!status) {
-            result.warnings.push('No changes to commit');
-            return result;
+        if (status) {
+            // Commit the changes
+            run('git commit -m "chore: add Coolify deployment configuration"');
+            result.committed = true;
+            hasNewCommit = true;
         }
     }
     catch {
-        result.warnings.push('Failed to check git status');
-        return result;
-    }
-    // Commit the changes
-    try {
-        run('git commit -m "chore: add Coolify deployment configuration"');
-        result.committed = true;
-    }
-    catch (error) {
-        result.warnings.push(`Failed to commit: ${error}`);
-        return result;
+        // Commit might fail if nothing staged, that's ok
     }
     // Check if remote exists
     const remoteUrl = getGitRemoteUrl();
@@ -82,23 +77,35 @@ export async function commitAndPushToDevelop(files) {
     }
     // Ensure develop branch exists and push to it
     try {
-        const currentBranch = run('git branch --show-current');
-        if (currentBranch === 'develop') {
-            // Already on develop, just push
+        if (originalBranch === 'develop') {
+            // Already on develop, pull and push
+            try {
+                run('git pull --rebase origin develop');
+            }
+            catch {
+                // Pull might fail if remote doesn't exist yet, that's ok
+            }
             run('git push origin develop');
         }
         else {
-            // Check if develop exists remotely
+            // On a feature branch - need to merge into develop
             try {
                 run('git fetch origin develop');
-                // Develop exists, checkout and merge/rebase current changes
+                // Develop exists remotely, checkout and merge feature branch
                 run('git checkout develop');
-                run(`git merge ${currentBranch} --no-edit`);
+                try {
+                    run('git pull --rebase origin develop');
+                }
+                catch {
+                    // Pull might fail, continue
+                }
+                // Merge the original branch (which has the commits)
+                run(`git merge ${originalBranch} --no-edit`);
                 run('git push origin develop');
             }
             catch {
-                // Develop doesn't exist remotely, create it from current branch
-                run('git push origin HEAD:develop');
+                // Develop doesn't exist remotely, create it from feature branch
+                run(`git push origin ${originalBranch}:develop`);
             }
         }
         result.pushed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@panoptic-it-solutions/coolify-setup",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "CLI tool for setting up Coolify deployment on Panoptic projects",
   "type": "module",
   "main": "dist/index.js",