@zjex/git-workflow 0.4.2 → 0.4.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [v0.4.2](https://github.com/iamzjt-front-end/git-workflow/compare/v0.4.1...v0.4.2) (2026-01-19)
+
+### 📖 Documentation
+
+- 移除冗余的快速链接部分 ([330b323](https://github.com/iamzjt-front-end/git-workflow/commit/330b323))
+
+### 🔧 Chore
+
+- 🔖 chore(release): 发布 v0.4.2 ([5d59590](https://github.com/iamzjt-front-end/git-workflow/commit/5d59590))
+
+
 ## [v0.4.1](https://github.com/iamzjt-front-end/git-workflow/compare/v0.4.0...v0.4.1) (2026-01-16)
 
 ### ✨ Features

package/README.md

@@ -12,7 +12,7 @@
   <a href="https://github.com/iamzjt-front-end/git-workflow"><img src="https://img.shields.io/github/stars/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=F59E0B" alt="github stars"></a>
   <a href="https://github.com/iamzjt-front-end/git-workflow/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/@zjex/git-workflow?style=flat&colorA=18181B&colorB=10B981" alt="license"></a>
   <a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-%3E%3D18-339933?style=flat&logo=node.js&logoColor=white&colorA=18181B" alt="node version"></a>
-  <a href="https://github.com/iamzjt-front-end/git-workflow/actions"><img src="https://img.shields.io/badge/tests-375%20passed-success?style=flat&colorA=18181B" alt="tests"></a>
+  <a href="https://github.com/iamzjt-front-end/git-workflow/actions"><img src="https://img.shields.io/badge/tests-431%20passed-success?style=flat&colorA=18181B" alt="tests"></a>
   <a href="https://github.com/iamzjt-front-end/git-workflow/issues"><img src="https://img.shields.io/github/issues/iamzjt-front-end/git-workflow?style=flat&colorA=18181B&colorB=EC4899" alt="issues"></a>
 </p>
 

package/dist/index.js

@@ -322,7 +322,7 @@ var init_update_notifier = __esm({
 // src/index.ts
 init_utils();
 import { cac } from "cac";
-import { select as select8 } from "@inquirer/prompts";
+import { select as select10 } from "@inquirer/prompts";
 import { ExitPromptError } from "@inquirer/core";
 
 // src/commands/branch.ts
@@ -573,7 +573,7 @@ async function deleteBranch(branchArg) {
     }
     if (branch.startsWith("__remote__")) {
       const remoteBranch = branch.replace("__remote__", "");
-      const confirm = await select({
+      const confirm3 = await select({
         message: `\u786E\u8BA4\u5220\u9664\u8FDC\u7A0B\u5206\u652F origin/${remoteBranch}?`,
         choices: [
           { name: "\u662F", value: true },
@@ -581,7 +581,7 @@ async function deleteBranch(branchArg) {
         ],
         theme
       });
-      if (!confirm) {
+      if (!confirm3) {
         console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
         return;
       }
@@ -1015,7 +1015,7 @@ async function deleteTag() {
     console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
     return;
   }
-  const confirm = await select2({
+  const confirm3 = await select2({
     message: `\u786E\u8BA4\u5220\u9664 tag: ${colors.red(tagToDelete)}?`,
     choices: [
       { name: "\u662F", value: true },
@@ -1023,7 +1023,7 @@ async function deleteTag() {
     ],
     theme
   });
-  if (!confirm) {
+  if (!confirm3) {
     console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
     return;
   }
@@ -3118,6 +3118,292 @@ async function log(options = {}) {
   executeTimelineLog(options);
 }
 
+// src/commands/amend-date.ts
+init_utils();
+import { execSync as execSync9 } from "child_process";
+import { select as select8, input as input6, confirm } from "@inquirer/prompts";
+function formatGitDate(date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+function parseDate(input8) {
+  const trimmed = input8.trim();
+  const dateMatch = trimmed.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+  if (dateMatch) {
+    const [, year, month, day] = dateMatch;
+    return new Date(
+      parseInt(year),
+      parseInt(month) - 1,
+      parseInt(day),
+      0,
+      0,
+      0
+    );
+  }
+  return null;
+}
+function getRecentCommits(limit = 20) {
+  const output = execOutput(`git log -${limit} --pretty=format:"%H|%s|%ai"`);
+  if (!output) return [];
+  return output.split("\n").map((line) => {
+    const [hash, message, date] = line.split("|");
+    return { hash, message, date };
+  });
+}
+function getCommitByHash(hash) {
+  try {
+    const output = execOutput(`git log -1 ${hash} --pretty=format:"%H|%s|%ai"`);
+    if (!output) return null;
+    const [fullHash, message, date] = output.split("|");
+    return { hash: fullHash, message, date };
+  } catch {
+    return null;
+  }
+}
+async function amendDate(commitHash) {
+  console.log(colors.cyan("\u4FEE\u6539 Commit \u63D0\u4EA4\u65F6\u95F4"));
+  divider();
+  let selectedCommit;
+  if (commitHash) {
+    const commit2 = getCommitByHash(commitHash);
+    if (!commit2) {
+      console.log(colors.red(`\u2716 \u627E\u4E0D\u5230 commit: ${commitHash}`));
+      return;
+    }
+    selectedCommit = commit2;
+  } else {
+    const commits = getRecentCommits(20);
+    if (commits.length === 0) {
+      console.log(colors.yellow("\u6CA1\u6709\u627E\u5230\u4EFB\u4F55 commit"));
+      return;
+    }
+    selectedCommit = await select8({
+      message: "\u9009\u62E9\u8981\u4FEE\u6539\u65F6\u95F4\u7684 commit:",
+      choices: commits.map((c) => ({
+        name: `${colors.yellow(c.hash.slice(0, 7))} ${c.message.slice(0, 60)} ${colors.dim(c.date)}`,
+        value: c,
+        description: c.date
+      })),
+      pageSize: 15,
+      theme
+    });
+  }
+  console.log("");
+  console.log("\u5F53\u524D commit \u4FE1\u606F:");
+  console.log(`  Hash:    ${colors.yellow(selectedCommit.hash.slice(0, 7))}`);
+  console.log(`  Message: ${selectedCommit.message}`);
+  console.log(`  Date:    ${colors.cyan(selectedCommit.date)}`);
+  divider();
+  console.log(colors.dim("\u8F93\u5165\u65E5\u671F\u683C\u5F0F: YYYY-MM-DD (\u5982: 2026-01-19)"));
+  console.log("");
+  const dateInput = await input6({
+    message: "\u8F93\u5165\u65B0\u7684\u65E5\u671F:",
+    validate: (value) => {
+      const parsed = parseDate(value);
+      if (!parsed) {
+        return "\u65E5\u671F\u683C\u5F0F\u4E0D\u6B63\u786E\uFF0C\u8BF7\u4F7F\u7528 YYYY-MM-DD \u683C\u5F0F";
+      }
+      return true;
+    },
+    theme
+  });
+  const newDate = parseDate(dateInput);
+  const formattedDate = formatGitDate(newDate);
+  divider();
+  console.log("\u4FEE\u6539\u9884\u89C8:");
+  console.log(`  Commit:   ${colors.yellow(selectedCommit.hash.slice(0, 7))}`);
+  console.log(`  \u65E7\u65F6\u95F4:   ${colors.dim(selectedCommit.date)}`);
+  console.log(`  \u65B0\u65F6\u95F4:   ${colors.green(formattedDate)}`);
+  console.log(`  \u4FEE\u6539\u7C7B\u578B: Author + Committer (\u4E24\u8005\u90FD\u4FEE\u6539)`);
+  divider();
+  const latestHash = execOutput("git rev-parse HEAD");
+  const isLatestCommit = selectedCommit.hash === latestHash;
+  if (!isLatestCommit) {
+    console.log(
+      colors.yellow(
+        "\u26A0\uFE0F  \u8B66\u544A: \u4FEE\u6539\u975E\u6700\u65B0 commit \u9700\u8981\u4F7F\u7528 rebase\uFF0C\u53EF\u80FD\u4F1A\u6539\u53D8 commit hash"
+      )
+    );
+    console.log(colors.dim("   \u8FD9\u4F1A\u5F71\u54CD\u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u7684 commit\uFF0C\u8BF7\u8C28\u614E\u64CD\u4F5C"));
+    console.log("");
+  }
+  const shouldProceed = await confirm({
+    message: "\u786E\u8BA4\u4FEE\u6539?",
+    default: false,
+    theme
+  });
+  if (!shouldProceed) {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  try {
+    if (isLatestCommit) {
+      execSync9(
+        `GIT_AUTHOR_DATE="${formattedDate}" GIT_COMMITTER_DATE="${formattedDate}" git commit --amend --no-edit --reset-author`,
+        { stdio: "pipe", shell: "/bin/bash" }
+      );
+      console.log("");
+      console.log(colors.green("\u2714 \u4FEE\u6539\u6210\u529F"));
+    } else {
+      console.log("");
+      console.log(colors.cyan("\u6B63\u5728\u6267\u884C rebase..."));
+      const parentHash = execOutput(`git rev-parse ${selectedCommit.hash}^`);
+      const filterCmd = `git filter-branch -f --env-filter 'if [ "$GIT_COMMIT" = "${selectedCommit.hash}" ]; then export GIT_AUTHOR_DATE="${formattedDate}"; export GIT_COMMITTER_DATE="${formattedDate}"; fi' ${parentHash}..HEAD`;
+      execSync9(filterCmd, { stdio: "pipe" });
+      console.log(colors.green("\u2714 \u4FEE\u6539\u6210\u529F"));
+      console.log("");
+      console.log(colors.yellow("\u26A0\uFE0F  \u6CE8\u610F: commit hash \u5DF2\u6539\u53D8"));
+      console.log(colors.dim("   \u5982\u679C\u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\uFF0C\u9700\u8981\u4F7F\u7528 force push:"));
+      console.log(colors.cyan("   git push --force-with-lease"));
+    }
+    console.log("");
+  } catch (error) {
+    console.log("");
+    console.log(colors.red("\u2716 \u4FEE\u6539\u5931\u8D25"));
+    if (error instanceof Error) {
+      console.log(colors.dim(error.message));
+    }
+    console.log("");
+    throw error;
+  }
+}
+
+// src/commands/amend.ts
+init_utils();
+import { execSync as execSync10 } from "child_process";
+import { select as select9, input as input7, confirm as confirm2 } from "@inquirer/prompts";
+function getRecentCommits2(limit = 20) {
+  const output = execOutput(`git log -${limit} --pretty=format:"%H|%s|%ai"`);
+  if (!output) return [];
+  return output.split("\n").map((line) => {
+    const [hash, message, date] = line.split("|");
+    return { hash, message, date };
+  });
+}
+function getCommitByHash2(hash) {
+  try {
+    const output = execOutput(`git log -1 ${hash} --pretty=format:"%H|%s|%ai"`);
+    if (!output) return null;
+    const [fullHash, message, date] = output.split("|");
+    return { hash: fullHash, message, date };
+  } catch {
+    return null;
+  }
+}
+async function amend(commitHash) {
+  console.log(colors.cyan("\u4FEE\u6539 Commit \u63D0\u4EA4\u4FE1\u606F"));
+  divider();
+  let selectedCommit;
+  if (commitHash) {
+    const commit2 = getCommitByHash2(commitHash);
+    if (!commit2) {
+      console.log(colors.red(`\u2716 \u627E\u4E0D\u5230 commit: ${commitHash}`));
+      return;
+    }
+    selectedCommit = commit2;
+  } else {
+    const commits = getRecentCommits2(20);
+    if (commits.length === 0) {
+      console.log(colors.yellow("\u6CA1\u6709\u627E\u5230\u4EFB\u4F55 commit"));
+      return;
+    }
+    selectedCommit = await select9({
+      message: "\u9009\u62E9\u8981\u4FEE\u6539\u7684 commit:",
+      choices: commits.map((c) => ({
+        name: `${colors.yellow(c.hash.slice(0, 7))} ${c.message} ${colors.dim(c.date)}`,
+        value: c,
+        description: c.message
+      })),
+      pageSize: 15,
+      theme
+    });
+  }
+  console.log("");
+  console.log("\u5F53\u524D commit \u4FE1\u606F:");
+  console.log(`  Hash:    ${colors.yellow(selectedCommit.hash.slice(0, 7))}`);
+  console.log(`  Message: ${selectedCommit.message}`);
+  console.log(`  Date:    ${colors.dim(selectedCommit.date)}`);
+  divider();
+  const newMessage = await input7({
+    message: "\u8F93\u5165\u65B0\u7684 commit message:",
+    default: selectedCommit.message,
+    validate: (value) => {
+      if (!value.trim()) {
+        return "commit message \u4E0D\u80FD\u4E3A\u7A7A";
+      }
+      return true;
+    },
+    theme
+  });
+  divider();
+  console.log("\u4FEE\u6539\u9884\u89C8:");
+  console.log(
+    `  Commit:      ${colors.yellow(selectedCommit.hash.slice(0, 7))}`
+  );
+  console.log(`  \u65E7 Message:  ${colors.dim(selectedCommit.message)}`);
+  console.log(`  \u65B0 Message:  ${colors.green(newMessage)}`);
+  divider();
+  const latestHash = execOutput("git rev-parse HEAD");
+  const isLatestCommit = selectedCommit.hash === latestHash;
+  if (!isLatestCommit) {
+    console.log(
+      colors.yellow(
+        "\u26A0\uFE0F  \u8B66\u544A: \u4FEE\u6539\u975E\u6700\u65B0 commit \u9700\u8981\u4F7F\u7528 rebase\uFF0C\u53EF\u80FD\u4F1A\u6539\u53D8 commit hash"
+      )
+    );
+    console.log(colors.dim("   \u8FD9\u4F1A\u5F71\u54CD\u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\u7684 commit\uFF0C\u8BF7\u8C28\u614E\u64CD\u4F5C"));
+    console.log("");
+  }
+  const shouldProceed = await confirm2({
+    message: "\u786E\u8BA4\u4FEE\u6539?",
+    default: false,
+    theme
+  });
+  if (!shouldProceed) {
+    console.log(colors.yellow("\u5DF2\u53D6\u6D88"));
+    return;
+  }
+  try {
+    if (isLatestCommit) {
+      execSync10(`git commit --amend -m "${newMessage.replace(/"/g, '\\"')}"`, {
+        stdio: "pipe"
+      });
+      console.log("");
+      console.log(colors.green("\u2714 \u4FEE\u6539\u6210\u529F"));
+    } else {
+      console.log("");
+      console.log(colors.cyan("\u6B63\u5728\u6267\u884C rebase..."));
+      const parentHash = execOutput(`git rev-parse ${selectedCommit.hash}^`);
+      const rebaseScript = `#!/bin/sh
+if [ "$1" = "${selectedCommit.hash}" ]; then
+  echo "${newMessage}" > "$2"
+fi
+`;
+      const filterCmd = `git filter-branch -f --msg-filter 'if [ "$GIT_COMMIT" = "${selectedCommit.hash}" ]; then echo "${newMessage.replace(/"/g, '\\"')}"; else cat; fi' ${parentHash}..HEAD`;
+      execSync10(filterCmd, { stdio: "pipe" });
+      console.log(colors.green("\u2714 \u4FEE\u6539\u6210\u529F"));
+      console.log("");
+      console.log(colors.yellow("\u26A0\uFE0F  \u6CE8\u610F: commit hash \u5DF2\u6539\u53D8"));
+      console.log(colors.dim("   \u5982\u679C\u5DF2\u63A8\u9001\u5230\u8FDC\u7A0B\uFF0C\u9700\u8981\u4F7F\u7528 force push:"));
+      console.log(colors.cyan("   git push --force-with-lease"));
+    }
+    console.log("");
+  } catch (error) {
+    console.log("");
+    console.log(colors.red("\u2716 \u4FEE\u6539\u5931\u8D25"));
+    if (error instanceof Error) {
+      console.log(colors.dim(error.message));
+    }
+    console.log("");
+    throw error;
+  }
+}
+
 // src/index.ts
 process.on("uncaughtException", (err) => {
   if (err instanceof ExitPromptError) {
@@ -3143,7 +3429,7 @@ process.on("SIGTERM", () => {
   console.log("");
   process.exit(0);
 });
-var version = true ? "0.4.2" : "0.0.0-dev";
+var version = true ? "0.4.3" : "0.0.0-dev";
 async function mainMenu() {
   console.log(
     colors.green(`
@@ -3157,7 +3443,7 @@ async function mainMenu() {
   );
   console.log(colors.dim(`  git-workflow v${colors.yellow(version)}
 `));
-  const action = await select8({
+  const action = await select10({
     message: "\u9009\u62E9\u64CD\u4F5C:",
     choices: [
       {
@@ -3201,11 +3487,19 @@ async function mainMenu() {
         value: "stash"
       },
       {
-        name: `[b] \uFFFD \u67E5\u770B\u65E5\u5FD7               ${colors.dim("gw log")}`,
+        name: `[b] \u{1F4DC} \u67E5\u770B\u65E5\u5FD7               ${colors.dim("gw log")}`,
         value: "log"
       },
       {
-        name: `[c] \u2699\uFE0F  \u521D\u59CB\u5316\u914D\u7F6E             ${colors.dim("gw init")}`,
+        name: `[c] \u{1F550} \u4FEE\u6539\u63D0\u4EA4\u65F6\u95F4           ${colors.dim("gw ad")}`,
+        value: "amend-date"
+      },
+      {
+        name: `[d] \u270F\uFE0F  \u4FEE\u6539\u63D0\u4EA4\u4FE1\u606F           ${colors.dim("gw amend")}`,
+        value: "amend"
+      },
+      {
+        name: `[e] \u2699\uFE0F  \u521D\u59CB\u5316\u914D\u7F6E             ${colors.dim("gw init")}`,
         value: "init"
       },
       { name: "[0] \u2753 \u5E2E\u52A9", value: "help" },
@@ -3258,6 +3552,14 @@ async function mainMenu() {
       checkGitRepo();
       await log();
       break;
+    case "amend-date":
+      checkGitRepo();
+      await amendDate();
+      break;
+    case "amend":
+      checkGitRepo();
+      await amend();
+      break;
     case "init":
       await init();
       break;
@@ -3341,18 +3643,28 @@ cli.command("log", "\u4EA4\u4E92\u5F0FGit\u65E5\u5FD7\u67E5\u770B (\u5206\u9875\
   if (options.limit) logOptions.limit = parseInt(options.limit);
   return log(logOptions);
 });
+cli.command("amend:date [hash]", "\u4FEE\u6539\u6307\u5B9A commit \u7684\u63D0\u4EA4\u65F6\u95F4").alias("ad").action(async (hash) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
+  checkGitRepo();
+  return amendDate(hash);
+});
+cli.command("amend [hash]", "\u4FEE\u6539\u6307\u5B9A commit \u7684\u63D0\u4EA4\u4FE1\u606F").action(async (hash) => {
+  await checkForUpdates(version, "@zjex/git-workflow");
+  checkGitRepo();
+  return amend(hash);
+});
 cli.command("clean", "\u6E05\u7406\u7F13\u5B58\u548C\u4E34\u65F6\u6587\u4EF6").alias("cc").action(async () => {
   const { clearUpdateCache: clearUpdateCache3 } = await Promise.resolve().then(() => (init_update_notifier(), update_notifier_exports));
   const { existsSync: existsSync5, unlinkSync: unlinkSync4, readdirSync } = await import("fs");
   const { homedir: homedir5, tmpdir: tmpdir2 } = await import("os");
   const { join: join6 } = await import("path");
-  const { select: select9 } = await import("@inquirer/prompts");
+  const { select: select11 } = await import("@inquirer/prompts");
   let cleanedCount = 0;
   let deletedGlobalConfig = false;
   const globalConfig = join6(homedir5(), ".gwrc.json");
   const hasGlobalConfig = existsSync5(globalConfig);
   if (hasGlobalConfig) {
-    const shouldDeleteConfig = await select9({
+    const shouldDeleteConfig = await select11({
       message: "\u68C0\u6D4B\u5230\u5168\u5C40\u914D\u7F6E\u6587\u4EF6\uFF0C\u662F\u5426\u5220\u9664\uFF1F",
       choices: [
         { name: "\u5426\uFF0C\u4FDD\u7559\u914D\u7F6E\u6587\u4EF6", value: false },

package/docs/.vitepress/config.ts

@@ -68,6 +68,8 @@ export default defineConfig({
             { text: "分支命令", link: "/commands/branch" },
             { text: "提交命令", link: "/commands/commit" },
             { text: "日志命令", link: "/commands/log" },
+            { text: "修改提交信息", link: "/commands/amend" },
+            { text: "修改提交时间", link: "/commands/amend-date" },
             { text: "Tag 命令", link: "/commands/tag" },
             { text: "Stash 命令", link: "/commands/stash" },
             { text: "版本命令", link: "/commands/release" },