alex-c-line 1.1.2 → 1.1.3

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.
Files changed (3) hide show
  1. package/dist/index.cjs +2 -3
  2. package/dist/index.js +2 -3
  3. package/package.json +1 -1
package/dist/index.cjs CHANGED
@@ -87,9 +87,8 @@ function gitCleanup(program2) {
87
87
  yield (0, import_execa.execa)("git", ["checkout", "main"], { stdio: "inherit" });
88
88
  yield (0, import_execa.execa)("git", ["pull", "origin", "main"], { stdio: "inherit" });
89
89
  if (rebase) {
90
- const { stdout: branches } = yield import_execa.execa`git branch -r`;
91
- const branchExists = branches.includes(`origin/${currentBranch}`);
92
- if (branchExists) {
90
+ const { stdout: changes } = yield import_execa.execa`git diff main..${currentBranch}`;
91
+ if (changes) {
93
92
  console.error("\u274C ERROR: Changes on branch not fully merged!");
94
93
  process.exitCode = 1;
95
94
  return;
package/dist/index.js CHANGED
@@ -64,9 +64,8 @@ function gitCleanup(program2) {
64
64
  yield execa("git", ["checkout", "main"], { stdio: "inherit" });
65
65
  yield execa("git", ["pull", "origin", "main"], { stdio: "inherit" });
66
66
  if (rebase) {
67
- const { stdout: branches } = yield execa`git branch -r`;
68
- const branchExists = branches.includes(`origin/${currentBranch}`);
69
- if (branchExists) {
67
+ const { stdout: changes } = yield execa`git diff main..${currentBranch}`;
68
+ if (changes) {
70
69
  console.error("\u274C ERROR: Changes on branch not fully merged!");
71
70
  process.exitCode = 1;
72
71
  return;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "alex-c-line",
3
- "version": "1.1.2",
3
+ "version": "1.1.3",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",