git 个人开发工作流

日常工作流#

feature-a 某个上游的基线分支

feature-a-xxx 基于 feature-a 的本地开发分支

多人开发时，优先在 feature-a-xxx 上提交自己的代码，定时通过 rebase 同步上游 feature-a 的改动，最后通过 merge 方式把本地的提交合并回上游

1
feature-a
2
----A---------B-------------C-------------------M(merge back)----
3
     \                         \                /
4
      \                         \              /
5
feature-a-xxx
6
      ----a1--------a2----rebase to C----a3---

本地开发时，可能会存在多次临时的提交，建议通过 squash 将本地的提交整理后再 merge 回上游分支

1
feature-a
2
----A---------B---------C---------D-------------------------------M----
3
     \                   \         \                            /
4
      \                   \         \                          /
5
feature-a-xxx
6
      ----a1----a2----rebase----a3----rebase----a4----a5----S(squash)

以下脚本主要添加了两个方便快速操作的实现

grebase 在本地开发分支上快速 rebase 上游分支

gmergebase 将本地开发分支 merge 回上游分支

1
# ============================================
2
# Git personal branch helpers - safe edition
3
# --------------------------------------------
4
# 约定：
5
#   个人开发分支 = <基线分支>-<个人后缀>
6
#   或         = <基线分支>/<个人后缀>
7
#
8
# 示例：
9
#   feature-a-sephy               -> feature-a
10
#   feature-order-refactor-jack   -> feature-order-refactor
11
#   feature-a/sephy               -> feature-a
12
#
13
# 提供命令：
14
#   gbase                   # 输出自动识别出的基线分支
15
#   gplan                   # 预览 rebase / merge 计划
16
#   grebase                 # 安全 rebase 到 origin/<base>
17
#   grebase --autostash     # 工作区不干净时自动暂存后 rebase
18
#   gmergebase              # merge 当前分支回基线分支，merge 后切回当前分支
19
#   gmergebase --push       # merge 后自动 push
20
#   gmergebase --squash     # squash merge
21
#   gmergebase --push --delete
22
#                          # merge + push + 删除已合并个人分支（本地）
23
# ============================================
24

25
# ---------- 基础输出 ----------
26

27
__gpb_info() { printf '[INFO] %s\n' "$*"; }
28
__gpb_warn() { printf '[WARN] %s\n' "$*" >&2; }
29
__gpb_err()  { printf '[ERR ] %s\n' "$*" >&2; }
30

31
# ---------- 基础判断 ----------
32

33
__gpb_in_git_repo() {
34
  git rev-parse --is-inside-work-tree >/dev/null 2>&1
35
}
36

37
__gpb_current_branch() {
38
  git branch --show-current 2>/dev/null
39
}
40

41
__gpb_branch_exists_local() {
42
  local branch="$1"
43
  git show-ref --verify --quiet "refs/heads/$branch"
44
}
45

46
__gpb_branch_exists_remote() {
47
  local branch="$1"
48
  git show-ref --verify --quiet "refs/remotes/origin/$branch"
49
}
50

51
__gpb_branch_exists_any() {
52
  local branch="$1"
53
  __gpb_branch_exists_local "$branch" || __gpb_branch_exists_remote "$branch"
54
}
55

56
__gpb_all_branches() {
57
  {
58
    git for-each-ref --format='%(refname:short)' refs/heads
59
    git for-each-ref --format='%(refname:short)' refs/remotes/origin
60
  } | sed 's#^origin/##' | grep -v '^HEAD$' | awk '!seen[$0]++'
61
}
62

63
# 工作区是否干净（含 staged / unstaged，忽略 untracked）
64
__gpb_worktree_clean() {
65
  git diff --quiet && git diff --cached --quiet
66
}
67

68
# 是否存在未跟踪文件
69
__gpb_has_untracked() {
70
  [ -n "$(git ls-files --others --exclude-standard)" ]
71
}
72

73
# 当前分支是否有未推送提交
74
__gpb_has_unpushed_commits() {
75
  local current upstream
76
  current="$(__gpb_current_branch)"
77
  upstream="$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)" || return 1
78
  [ -n "$(git rev-list "${upstream}..HEAD" 2>/dev/null)" ]
79
}
80

81
# 当前分支是否落后于上游
82
__gpb_is_behind_upstream() {
83
  local upstream
84
  upstream="$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)" || return 1
85
  [ -n "$(git rev-list "HEAD..${upstream}" 2>/dev/null)" ]
86
}
87

88
# 基线分支是否包含当前开发分支（用于删除前校验）
89
__gpb_is_merged_into() {
90
  local src="$1"
91
  local target="$2"
92
  git merge-base --is-ancestor "$src" "$target"
93
}
94

95
# ---------- 基线推导 ----------
96

97
__gpb_infer_base_branch() {
98
  local current="$1"
99
  local best=""
100
  local candidate=""
101

102
  [ -z "$current" ] && return 1
103

104
  while IFS= read -r candidate; do
105
    [ -z "$candidate" ] && continue
106
    [ "$candidate" = "$current" ] && continue
107

108
    case "$current" in
109
      "$candidate"-*|"$candidate"/*)
110
        if [ ${#candidate} -gt ${#best} ]; then
111
          best="$candidate"
112
        fi
113
        ;;
114
    esac
115
  done < <(__gpb_all_branches)
116

117
  if [ -n "$best" ]; then
118
    printf '%s\n' "$best"
119
    return 0
120
  fi
121

122
  if [[ "$current" == *-* ]]; then
123
    local by_dash="${current%-*}"
124
    if __gpb_branch_exists_any "$by_dash"; then
125
      printf '%s\n' "$by_dash"
126
      return 0
127
    fi
128
  fi
129

130
  if [[ "$current" == */* ]]; then
131
    local by_slash="${current%/*}"
132
    if __gpb_branch_exists_any "$by_slash"; then
133
      printf '%s\n' "$by_slash"
134
      return 0
135
    fi
136
  fi
137

138
  return 1
139
}
140

141
gbase() {
142
  __gpb_in_git_repo || { __gpb_err "Not a git repository"; return 1; }
143

144
  local current base
145
  current="$(__gpb_current_branch)"
146
  [ -n "$current" ] || { __gpb_err "Cannot determine current branch"; return 1; }
147

148
  base="$(__gpb_infer_base_branch "$current")" || {
149
    __gpb_err "Cannot infer base branch from current branch: $current"
150
    return 1
151
  }
152

153
  printf '%s\n' "$base"
154
}
155

156
# ---------- 计划预览 ----------
157

158
gplan() {
159
  __gpb_in_git_repo || { __gpb_err "Not a git repository"; return 1; }
160

161
  local current base
162
  current="$(__gpb_current_branch)"
163
  [ -n "$current" ] || { __gpb_err "Cannot determine current branch"; return 1; }
164

165
  base="$(__gpb_infer_base_branch "$current")" || {
166
    __gpb_err "Cannot infer base branch from current branch: $current"
167
    return 1
168
  }
169

170
  cat <<EOF
171
Current branch : $current
172
Base branch    : $base
173

174
Rebase:
175
  git fetch origin --prune
176
  git rebase origin/$base
177

178
Merge back:
179
  git fetch origin --prune
180
  git checkout $base
181
  git pull --ff-only origin $base
182
  git merge --no-ff $current
183
  git checkout $current
184
EOF
185
}
186

187
# ---------- 安全 rebase ----------
188

189
grebase() {
190
  __gpb_in_git_repo || { __gpb_err "Not a git repository"; return 1; }
191

192
  local autostash=0
193
  while [ $# -gt 0 ]; do
194
    case "$1" in
195
      --autostash) autostash=1 ;;
196
      *)
197
        __gpb_err "Unknown option: $1"
198
        return 1
199
        ;;
200
    esac
201
    shift
202
  done
203

204
  local current base stashed=0 stash_msg
205
  current="$(__gpb_current_branch)"
206
  [ -n "$current" ] || { __gpb_err "Cannot determine current branch"; return 1; }
207

208
  base="$(__gpb_infer_base_branch "$current")" || {
209
    __gpb_err "Cannot infer base branch from current branch: $current"
210
    return 1
211
  }
212

213
  if [ "$current" = "$base" ]; then
214
    __gpb_err "Current branch is already the base branch: $base"
215
    return 1
216
  fi
217

218
  __gpb_info "Current branch : $current"
219
  __gpb_info "Base branch    : $base"
220

221
  if ! __gpb_worktree_clean; then
222
    if [ "$autostash" -eq 1 ]; then
223
      stash_msg="grebase-autostash-$(date +%Y%m%d%H%M%S)"
224
      __gpb_warn "Working tree is dirty, auto stashing changes: $stash_msg"
225
      git stash push -u -m "$stash_msg" >/dev/null || {
226
        __gpb_err "git stash failed"
227
        return 1
228
      }
229
      stashed=1
230
    else
231
      __gpb_err "Working tree is dirty. Commit/stash first, or use: grebase --autostash"
232
      return 1
233
    fi
234
  fi
235

236
  git fetch origin --prune || {
237
    [ "$stashed" -eq 1 ] && __gpb_warn "Your changes are stashed. Restore manually if needed: git stash list"
238
    return 1
239
  }
240

241
  if ! __gpb_branch_exists_remote "$base"; then
242
    __gpb_err "Remote branch origin/$base does not exist"
243
    [ "$stashed" -eq 1 ] && __gpb_warn "Your changes are stashed. Restore manually if needed: git stash pop"
244
    return 1
245
  fi
246

247
  if ! git rebase "origin/$base"; then
248
    __gpb_err "Rebase failed. Resolve conflicts, then run:"
249
    printf '       git add <files>\n'
250
    printf '       git rebase --continue\n'
251
    printf '       # or git rebase --abort\n'
252
    [ "$stashed" -eq 1 ] && __gpb_warn "Auto-stash was created. Apply it after rebase is fully done."
253
    return 1
254
  fi
255

256
  if [ "$stashed" -eq 1 ]; then
257
    __gpb_info "Restoring stashed changes"
258
    if ! git stash pop; then
259
      __gpb_warn "git stash pop had conflicts or was not fully applied. Check: git stash list"
260
      return 1
261
    fi
262
  fi
263

264
  __gpb_info "Rebase completed successfully"
265
}
266

267
# ---------- 安全 merge back ----------
268

269
gmergebase() {
270
  __gpb_in_git_repo || { __gpb_err "Not a git repository"; return 1; }
271

272
  local do_push=0
273
  local do_squash=0
274
  local do_delete=0
275

276
  while [ $# -gt 0 ]; do
277
    case "$1" in
278
      --push) do_push=1 ;;
279
      --squash) do_squash=1 ;;
280
      --delete) do_delete=1 ;;
281
      *)
282
        __gpb_err "Unknown option: $1"
283
        return 1
284
        ;;
285
    esac
286
    shift
287
  done
288

289
  local dev base original_branch
290
  original_branch="$(__gpb_current_branch)"
291
  dev="$original_branch"
292

293
  [ -n "$dev" ] || { __gpb_err "Cannot determine current branch"; return 1; }
294

295
  base="$(__gpb_infer_base_branch "$dev")" || {
296
    __gpb_err "Cannot infer base branch from current branch: $dev"
297
    return 1
298
  }
299

300
  if [ "$dev" = "$base" ]; then
301
    __gpb_err "Current branch is already the base branch: $base"
302
    return 1
303
  fi
304

305
  __gpb_info "Dev branch     : $dev"
306
  __gpb_info "Base branch    : $base"
307

308
  if ! __gpb_worktree_clean; then
309
    __gpb_err "Working tree is dirty. Please commit/stash first."
310
    return 1
311
  fi
312

313
  if __gpb_has_untracked; then
314
    __gpb_warn "There are untracked files in working tree"
315
  fi
316

317
  git fetch origin --prune || return 1
318

319
  if __gpb_has_unpushed_commits; then
320
    __gpb_warn "Current branch has unpushed commits"
321
    __gpb_warn "Consider pushing first for backup"
322
  fi
323

324
  if __gpb_is_behind_upstream; then
325
    __gpb_warn "Current branch is behind its upstream"
326
  fi
327

328
  if ! __gpb_branch_exists_any "$base"; then
329
    __gpb_err "Base branch does not exist locally/remotely: $base"
330
    return 1
331
  fi
332

333
  git checkout "$base" || return 1
334

335
  if __gpb_branch_exists_remote "$base"; then
336
    git pull --ff-only origin "$base" || {
337
      __gpb_err "Failed to fast-forward local $base from origin/$base"
338
      git checkout "$original_branch" >/dev/null 2>&1
339
      return 1
340
    }
341
  fi
342

343
  if [ "$do_squash" -eq 1 ]; then
344
    __gpb_info "Running squash merge"
345
    git merge --squash "$dev" || {
346
      __gpb_err "Squash merge failed"
347
      git checkout "$original_branch" >/dev/null 2>&1
348
      return 1
349
    }
350

351
    __gpb_warn "Squash merge staged changes only; commit manually:"
352
    printf '       git commit -m "merge %s into %s"\n' "$dev" "$base"
353

354
    git checkout "$original_branch" >/dev/null 2>&1 || true
355
    return 0
356
  fi
357

358
  __gpb_info "Running merge --no-ff"
359
  git merge --no-ff "$dev" || {
360
    __gpb_err "Merge failed. Resolve conflicts, then commit."
361
    __gpb_warn "After merge is completed manually, you may switch back with: git checkout $original_branch"
362
    return 1
363
  }
364

365
  if [ "$do_push" -eq 1 ]; then
366
    __gpb_info "Pushing $base to origin"
367
    git push origin "$base" || {
368
      __gpb_err "Push failed"
369
      git checkout "$original_branch" >/dev/null 2>&1 || true
370
      return 1
371
    }
372
  fi
373

374
  if [ "$do_delete" -eq 1 ]; then
375
    if __gpb_is_merged_into "$dev" "$base"; then
376
      __gpb_info "Deleting merged local branch: $dev"
377
      git branch -d "$dev" || {
378
        __gpb_warn "Failed to delete local branch: $dev"
379
      }
380
    else
381
      __gpb_warn "Skip deleting $dev because it is not fully merged into $base"
382
    fi
383
  fi
384

385
  __gpb_info "Switching back to original branch: $original_branch"
386
  git checkout "$original_branch" >/dev/null 2>&1 || {
387
    __gpb_warn "Failed to switch back automatically. Please run: git checkout $original_branch"
388
    return 0
389
  }
390

391
  __gpb_info "Merge back completed successfully"
392
}
393

394
# ---------- 可选快捷别名 ----------
395
alias grb='grebase'
396
alias gmb='gmergebase'

日常工作流#

文章分享