alex-c-line 1.2.0 → 1.2.2
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/index.cjs +5 -3
- package/dist/index.js +5 -3
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -117,7 +117,10 @@ function gitPostMergeCleanup(program2) {
|
|
|
117
117
|
);
|
|
118
118
|
} catch (e) {
|
|
119
119
|
}
|
|
120
|
-
|
|
120
|
+
if (!alexCLineConfigJSON) {
|
|
121
|
+
alexCLineConfigJSON = "{}";
|
|
122
|
+
}
|
|
123
|
+
const alexCLineConfig = JSON.parse(alexCLineConfigJSON);
|
|
121
124
|
const rebase = (_c = (_b = alexCLineConfig["git-post-merge-cleanup"]) == null ? void 0 : _b.rebase) != null ? _c : rebaseOption;
|
|
122
125
|
console.log(
|
|
123
126
|
`Running git-post-merge-cleanup in ${rebase ? "rebase" : "merge"} mode...`
|
|
@@ -132,7 +135,6 @@ function gitPostMergeCleanup(program2) {
|
|
|
132
135
|
stdio: "inherit"
|
|
133
136
|
});
|
|
134
137
|
if (rebase) {
|
|
135
|
-
console.log("Using rebase mode...");
|
|
136
138
|
yield runCommandAndLogToConsole("git", ["fetch", "origin", "main"]);
|
|
137
139
|
yield runCommandAndLogToConsole("git", ["pull", "origin", "main"]);
|
|
138
140
|
}
|
|
@@ -155,7 +157,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
155
157
|
if (error instanceof import_execa2.ExecaError) {
|
|
156
158
|
console.error("\u274C ERROR: Changes on branch not fully merged!");
|
|
157
159
|
yield import_execa2.execa`git checkout ${currentBranch}`;
|
|
158
|
-
process.
|
|
160
|
+
process.exit(1);
|
|
159
161
|
}
|
|
160
162
|
throw error;
|
|
161
163
|
}
|
package/dist/index.js
CHANGED
|
@@ -96,7 +96,10 @@ function gitPostMergeCleanup(program2) {
|
|
|
96
96
|
);
|
|
97
97
|
} catch (e) {
|
|
98
98
|
}
|
|
99
|
-
|
|
99
|
+
if (!alexCLineConfigJSON) {
|
|
100
|
+
alexCLineConfigJSON = "{}";
|
|
101
|
+
}
|
|
102
|
+
const alexCLineConfig = JSON.parse(alexCLineConfigJSON);
|
|
100
103
|
const rebase = (_c = (_b = alexCLineConfig["git-post-merge-cleanup"]) == null ? void 0 : _b.rebase) != null ? _c : rebaseOption;
|
|
101
104
|
console.log(
|
|
102
105
|
`Running git-post-merge-cleanup in ${rebase ? "rebase" : "merge"} mode...`
|
|
@@ -111,7 +114,6 @@ function gitPostMergeCleanup(program2) {
|
|
|
111
114
|
stdio: "inherit"
|
|
112
115
|
});
|
|
113
116
|
if (rebase) {
|
|
114
|
-
console.log("Using rebase mode...");
|
|
115
117
|
yield runCommandAndLogToConsole("git", ["fetch", "origin", "main"]);
|
|
116
118
|
yield runCommandAndLogToConsole("git", ["pull", "origin", "main"]);
|
|
117
119
|
}
|
|
@@ -134,7 +136,7 @@ function gitPostMergeCleanup(program2) {
|
|
|
134
136
|
if (error instanceof ExecaError) {
|
|
135
137
|
console.error("\u274C ERROR: Changes on branch not fully merged!");
|
|
136
138
|
yield execa2`git checkout ${currentBranch}`;
|
|
137
|
-
process.
|
|
139
|
+
process.exit(1);
|
|
138
140
|
}
|
|
139
141
|
throw error;
|
|
140
142
|
}
|