Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,10 @@
 # 更新日志
 
+## 2022.08.12 v3.3.3 更新日志
+
+1. 修复`admin`指令合并判断不准确的遗留问题
+2. 新增`fetch`公共方法
+
 ## 2022.08.12 v3.3.2 更新日志
 
 1. 修复构建流程导致 gitm-ui 无法运行的问题

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gitmars/monorepo",
     "description": "这是一个git工作流工具",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "packageManager": "[email protected]",
     "main": "index.js",
     "files": [

packages/core/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gitmars/core",
     "description": "gitmars核心程序",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": false,
     "main": "./lib/index.js",
     "module": "./lib/index.mjs",

packages/core/src/git/fetch.ts

@@ -0,0 +1,12 @@
+import { spawnSync } from '../spawn'
+import { debug } from '../utils/debug'
+
+/**
+ * 同步远程版本
+ */
+function fetch(): void {
+    debug('fetch', 'fetch success')
+    spawnSync('git', ['fetch'])
+}
+
+export default fetch

packages/core/src/git/getAheadLogs.ts

@@ -1,5 +1,6 @@
 import { spawnSync } from '../spawn'
 import { debug } from '../utils/debug'
+import fetch from './fetch'
 import getCurrentBranch from './getCurrentBranch'
 
 /**
@@ -9,7 +10,7 @@ import getCurrentBranch from './getCurrentBranch'
  */
 function getAheadLogs(): string[] {
     const current = getCurrentBranch()
-    spawnSync('git', ['fetch'])
+    fetch()
     const { stdout } = spawnSync('git', [
         'log',
         `origin/${current}..${current}`,

packages/core/src/git/getBehindLogs.ts

@@ -1,5 +1,6 @@
 import { spawnSync } from '../spawn'
 import { debug } from '../utils/debug'
+import fetch from './fetch'
 import getCurrentBranch from './getCurrentBranch'
 
 /**
@@ -11,7 +12,7 @@ import getCurrentBranch from './getCurrentBranch'
  */
 function getBehindLogs(): string[] {
     const current = getCurrentBranch()
-    spawnSync('git', ['fetch'])
+    fetch()
     const { stdout } = spawnSync('git', [
         'log',
         `${current}..origin/${current}`,

packages/core/src/git/index.ts

@@ -18,6 +18,7 @@ import getGitStatus from './getGitStatus'
 import getCommandMessage from './getCommandMessage'
 import checkGitStatus from './checkGitStatus'
 import getStashList from './getStashList'
+import fetch from './fetch'
 
 export default {
     getIsGitProject,
@@ -40,5 +41,6 @@ export default {
     getGitStatus,
     getCommandMessage,
     checkGitStatus,
-    getStashList
+    getStashList,
+    fetch
 }

packages/docs/changelog.md

@@ -1,5 +1,14 @@
 # 更新日志
 
+## 2022.08.12 v3.3.3 更新日志
+
+1. 修复`admin`指令合并判断不准确的遗留问题
+2. 新增`fetch`公共方法
+
+## 2022.08.12 v3.3.2 更新日志
+
+1. 修复构建流程导致 gitm-ui 无法运行的问题
+
 ## 2022.08.11 v3.3.1 更新日志
 
 1. 修复`admin`指令合并判断不准确的问题

packages/docs/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gitmars/docs",
     "description": "gitmars文档库",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": false,
     "files": [
         "dist",

packages/gitmars/package.json

@@ -1,7 +1,7 @@
 {
     "name": "gitmars",
     "description": "这是一个git工作流工具",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": false,
     "bin": {
         "gitm": "lib/gitm.js"

packages/gitmars/src/gitm-admin.ts

@@ -15,6 +15,7 @@ const getCurrentBranch = require('@gitmars/core/lib/git/getCurrentBranch')
 const getGitConfig = require('@gitmars/core/lib/git/getGitConfig')
 const getIsMergedTargetBranch = require('@gitmars/core/lib/git/getIsMergedTargetBranch')
 const checkGitStatus = require('@gitmars/core/lib/git/checkGitStatus')
+const fetch = require('@gitmars/core/lib/git/fetch')
 const { createArgs } = require('@gitmars/core/lib/utils/command')
 const { spawnSync } = require('@gitmars/core/lib/spawn')
 const echo = require('@gitmars/core/lib/utils/echo')
@@ -141,6 +142,7 @@ publishProgram.action(
         const curBranch = await getCurrentBranch()
         let isDescriptionCorrect = true // 本次提交的原因描述是否符合规范
         if (!status) process.exit(1)
+        fetch()
         // 有配置descriptionValidator时需要校验描述信息
         if (config.descriptionValidator) {
             // 校验本次提交的原因描述

packages/gitmars/src/gitm-cleanbranch.ts

@@ -13,6 +13,7 @@ const searchBranches = require('@gitmars/core/lib/git/searchBranches')
 const getCurrentBranch = require('@gitmars/core/lib/git/getCurrentBranch')
 const getIsMergedTargetBranch = require('@gitmars/core/lib/git/getIsMergedTargetBranch')
 const getIsBranchOrCommitExist = require('@gitmars/core/lib/git/getIsBranchOrCommitExist')
+const fetch = require('@gitmars/core/lib/git/fetch')
 const { createArgs } = require('@gitmars/core/lib/utils/command')
 const delay = require('@gitmars/core/lib/utils/delay')
 const echo = require('@gitmars/core/lib/utils/echo')
@@ -111,7 +112,7 @@ program.action(async (branches: string[], opt: GitmBuildOption) => {
     const targets = opt.target
         ? opt.target.split(',')
         : [config.develop, config.release]
-    spawnSync('git', ['fetch'])
+    fetch()
     // 没有传入指定分支，进行查询
     if (branches.length === 0) {
         branches = searchBranches({

packages/server/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gitmars/server",
     "description": "gitmars可视化界面服务端",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": false,
     "bin": {
         "gitm-server": "./lib/www.js"

packages/ui/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gitmars/ui",
     "description": "gitmars可视化界面",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "private": false,
     "bin": {
         "gitm-ui": "./index.js"