@wzyjs/cli 0.0.28 → 0.0.31

package/dist/commands/merge/script.js

@@ -37,8 +37,14 @@ function execGitCommand(command) {
     });
 }
 exports.default = async (options) => {
-    if (options?.commit) {
-        console.log('commit success', await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`));
+    const hasChange = await execGitCommand('git status -s');
+    if (hasChange) {
+        if (options?.commit) {
+            console.log('commit success', await execGitCommand(`git commit -a -m "${(await getLatestCommitMsg()).trim()}"`));
+        }
+        else {
+            console.log('stash success', await execGitCommand('git stash'));
+        }
     }
     const count = options?.count || await getContinuousCommitCount();
     const command = `GIT_EDITOR=true GIT_SEQUENCE_EDITOR="sed -i -e '2,\\$s/^pick/squash/'" git rebase -i HEAD~${count}`;
@@ -46,4 +52,7 @@ exports.default = async (options) => {
     if (options?.push) {
         console.log('push success', await execGitCommand('git push origin HEAD --force'));
     }
+    if (hasChange && !options?.commit) {
+        await execGitCommand('git stash pop');
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wzyjs/cli",
-  "version": "0.0.28",
+  "version": "0.0.31",
   "description": "description",
   "author": "wzy",
   "license": "ISC",
@@ -21,7 +21,7 @@
     "@midwayjs/command-core": "^1.3.14",
     "@midwayjs/hooks": "^3.0.1",
     "@umijs/plugins": "^4.0.28",
-    "@wzyjs/utils": "^0.0.28",
+    "@wzyjs/utils": "^0.0.31",
     "cac": "^6.7.14",
     "fs-extra": "^10.1.0",
     "rc-field-form": "^1.32.2",
@@ -42,5 +42,5 @@
     "type": "git",
     "url": "https://gitee.com/wang-zhenyu/app.git"
   },
-  "gitHead": "b27e8d285e4092485cd1be538c1f571bc29e7835"
+  "gitHead": "eb60e54549c1be64d94b0a4864dacd1f4ed97473"
 }