06 分支管理 —— Bug分支

06 分支管理 —— Bug分支

软件开发中，bug就像屡见不鲜同样。有了bug就须要修复，在Git中，因为分支是如此的强大，因此每一个bug均可以经过一个新的临时分支来修复，修复后，合并分支，而后将临时分支删除。

切换回dev分支

lwenhaodeMacBook-Pro:TestGit lwenhao$ git checkout dev
Switched to branch 'dev'

修改README.md内容：

lwenhaodeMacBook-Pro:TestGit lwenhao$ cat README.md 
# TestGit

建立一个"dev"分支，我来操做。

学习分支管理策略。

编辑了dev分支上的内容，如今准备学习bug分支

lwenhaodeMacBook-Pro:TestGit lwenhao$

当你找到一个openfire的bug的任务时，你想建立一个分支issue-openfire来修复它，可是，当前正在dev上进行的工做尚未提交：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git status
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")
lwenhaodeMacBook-Pro:TestGit lwenhao$

并非你不想提交，而是工做只进行到一半，还无法提交，预计完成还需1天时间。可是，必须在两个小时内修复该bug，怎么办？

幸亏，Git还提供了一个stash功能，能够把当前工做现场“储藏”起来，等之后恢复现场后继续工做：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git stash
Saved working directory and index state WIP on dev: 8faa495 add 学习
lwenhaodeMacBook-Pro:TestGit lwenhao$

如今，用git status查看工做区，就是干净的，所以能够放心地建立分支来修复bug。

lwenhaodeMacBook-Pro:TestGit lwenhao$ git status
On branch dev
nothing to commit, working tree clean
lwenhaodeMacBook-Pro:TestGit lwenhao$

首先肯定要在哪一个分支上修复bug，假定须要在master分支上修复，就从master建立临时分支：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 6 commits.
  (use "git push" to publish your local commits)
lwenhaodeMacBook-Pro:TestGit lwenhao$ git checkout -b issue-openfire
Switched to a new branch 'issue-openfire'
lwenhaodeMacBook-Pro:TestGit lwenhao$

如今修复bug，须要把README.md中的“dev”改成“master”

lwenhaodeMacBook-Pro:TestGit lwenhao$ cat README.md 
# TestGit

建立一个"master"分支，我来操做。

学习分支管理策略。

lwenhaodeMacBook-Pro:TestGit lwenhao$

而后提交：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git add README.md 
lwenhaodeMacBook-Pro:TestGit lwenhao$ git commit -m "dev to master"
[issue-openfire c0e8f25] dev to master
 1 file changed, 1 insertion(+), 1 deletion(-)
lwenhaodeMacBook-Pro:TestGit lwenhao$

修复完成后，切换到master分支，并完成合并，最后删除issue-openfire分支：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 6 commits.
  (use "git push" to publish your local commits)
lwenhaodeMacBook-Pro:TestGit lwenhao$ git merge --no-ff -m "merged bug fix openfire" issue-openfire
Merge made by the 'recursive' strategy.
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lwenhaodeMacBook-Pro:TestGit lwenhao$

原计划两个小时的bug修复只花了5分钟！如今，是时候接着回到dev分支干活了！

lwenhaodeMacBook-Pro:TestGit lwenhao$ git checkout dev
Switched to branch 'dev'
lwenhaodeMacBook-Pro:TestGit lwenhao$ git status
On branch dev
nothing to commit, working tree clean
lwenhaodeMacBook-Pro:TestGit lwenhao$

工做区是干净的，刚才的工做现场存到哪去了？用git stash list命令看看：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git stash list
stash@{0}: WIP on dev: 8faa495 add 学习
lwenhaodeMacBook-Pro:TestGit lwenhao$

工做现场还在，Git把stash内容存在某个地方了，可是须要恢复一下，有两个办法：

一是用git stash apply恢复，可是恢复后，stash内容并不删除，你须要用git stash drop来删除；

另外一种方式是用git stash pop，恢复的同时把stash内容也删了：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git stash pop
On branch dev
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (97050754b252007d69e787968cccfa46f54f7f31)
lwenhaodeMacBook-Pro:TestGit lwenhao$

再用git stash list查看，就看不到任何stash内容了：

lwenhaodeMacBook-Pro:TestGit lwenhao$ git stash list
lwenhaodeMacBook-Pro:TestGit lwenhao$

你能够屡次stash，恢复的时候，先用git stash list查看，而后恢复指定的stash，用命令：

git stash apply stash@{0}

修复bug时，咱们会经过建立新的bug分支进行修复，而后合并，最后删除；

当手头工做没有完成时，先把工做现场git stash一下，而后去修复bug，修复后，再git stash pop，回到工做现场。

继续阅读：07 分支管理 —— Feature分支