@panoptic-it-solutions/coolify-setup 1.1.25 → 1.1.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/git.js +10 -3
- package/package.json +1 -1
package/dist/git.js
CHANGED
|
@@ -99,12 +99,19 @@ export async function commitAndPushToDevelop(files, originalBranch) {
|
|
|
99
99
|
// Develop doesn't exist remotely
|
|
100
100
|
}
|
|
101
101
|
if (developExistsRemotely) {
|
|
102
|
-
//
|
|
102
|
+
// Check if develop exists locally
|
|
103
|
+
let developExistsLocally = false;
|
|
103
104
|
try {
|
|
104
|
-
run('git
|
|
105
|
+
run('git rev-parse --verify develop');
|
|
106
|
+
developExistsLocally = true;
|
|
105
107
|
}
|
|
106
108
|
catch {
|
|
107
|
-
//
|
|
109
|
+
// develop doesn't exist locally
|
|
110
|
+
}
|
|
111
|
+
if (developExistsLocally) {
|
|
112
|
+
run('git checkout develop');
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
108
115
|
run('git checkout -b develop origin/develop');
|
|
109
116
|
}
|
|
110
117
|
// Pull latest changes
|