diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a21420..907bfc45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 更新日志 -## 2023.01.04 v4.0.2 更新日志 +## 2023.01.04 v4.0.3 更新日志 1. 修复`getIsMergedTargetBranch`在 windows 下的兼容问题 2. os-local 降级 diff --git a/package.json b/package.json index f4ab6c25..486beb5b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/monorepo", "description": "这是一个git工作流工具", - "version": "4.0.2", + "version": "4.0.3", "packageManager": "pnpm@7.18.0", "main": "index.js", "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index ceb645ff..bc37751f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/core", "description": "gitmars核心程序", - "version": "4.0.2", + "version": "4.0.3", "private": false, "main": "./lib/index.js", "module": "./lib/index.mjs", diff --git a/packages/core/src/git/getAheadLogs.ts b/packages/core/src/git/getAheadLogs.ts index 07597101..9135e9f5 100644 --- a/packages/core/src/git/getAheadLogs.ts +++ b/packages/core/src/git/getAheadLogs.ts @@ -14,7 +14,6 @@ function getAheadLogs(): string[] { const { stdout } = spawnSync('git', [ 'log', `origin/${current}..${current}`, - '--', '--pretty', 'format:%p' ]) diff --git a/packages/core/src/git/getBehindLogs.ts b/packages/core/src/git/getBehindLogs.ts index f2b80884..2b63b240 100644 --- a/packages/core/src/git/getBehindLogs.ts +++ b/packages/core/src/git/getBehindLogs.ts @@ -16,7 +16,6 @@ function getBehindLogs(): string[] { const { stdout } = spawnSync('git', [ 'log', `${current}..origin/${current}`, - '--', '--pretty', 'format:%p' ]) diff --git a/packages/core/src/git/getIsMergedTargetBranch.ts b/packages/core/src/git/getIsMergedTargetBranch.ts index 4f89daa6..2c53301c 100644 --- a/packages/core/src/git/getIsMergedTargetBranch.ts +++ b/packages/core/src/git/getIsMergedTargetBranch.ts @@ -29,11 +29,11 @@ function getIsMergedTargetBranch( } const { stdout } = spawnSync('git', [ 'log', + noMerges ? '--no-merges' : '', + '--format=%h', branch, `^${targetBranch}`, - '--', - noMerges ? '--no-merges' : '', - '--format=%h' + '--' ]) debug('getIsMergedTargetBranch', stdout) return !stdout || !/[a-zA-Z0-9]+/.test(stdout) diff --git a/packages/docs/changelog.md b/packages/docs/changelog.md index 35a21420..907bfc45 100644 --- a/packages/docs/changelog.md +++ b/packages/docs/changelog.md @@ -1,6 +1,6 @@ # 更新日志 -## 2023.01.04 v4.0.2 更新日志 +## 2023.01.04 v4.0.3 更新日志 1. 修复`getIsMergedTargetBranch`在 windows 下的兼容问题 2. os-local 降级 diff --git a/packages/docs/package.json b/packages/docs/package.json index 814366ff..5ccee369 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/docs", "description": "gitmars文档库", - "version": "4.0.2", + "version": "4.0.3", "private": false, "files": [ "dist", diff --git a/packages/gitmars/package.json b/packages/gitmars/package.json index d5804aaf..a9b5ef9a 100644 --- a/packages/gitmars/package.json +++ b/packages/gitmars/package.json @@ -1,7 +1,7 @@ { "name": "gitmars", "description": "这是一个git工作流工具", - "version": "4.0.2", + "version": "4.0.3", "private": false, "bin": { "gitm": "lib/gitm.mjs" diff --git a/packages/server/package.json b/packages/server/package.json index d1d5a258..9f6f15ad 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/server", "description": "gitmars可视化界面服务端", - "version": "4.0.2", + "version": "4.0.3", "private": false, "type": "module", "bin": { diff --git a/packages/ui/package.json b/packages/ui/package.json index 1a68a8b3..2bd97533 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,7 +1,7 @@ { "name": "@gitmars/ui", "description": "gitmars可视化界面", - "version": "4.0.2", + "version": "4.0.3", "private": false, "bin": { "gitm-ui": "./index.mjs"