軟件開發中,bug就像家常便飯一樣。有了bug就需要修復,在Git中,由於分支是如此的強大,所以,每個bug都可以通過一個新的臨時分支來修復,修復後,合併分支,然後將臨時分支刪除。
當你接到一個修復一個代號101的bug的任務時,很自然地,你想創建一個分支issue-101
來修復它,但是,等等,當前正在dev
上進行的工作還沒有提交:
git status
On branch master
Your branch is ahead of 'origin/master' by 6 commits.
(use "git push" to publish your local commits)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: ReadMe.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
gitskills/
並不是你不想提交,而是工作只進行到一半,還沒法提交,預計完成還需1天時間。但是,必須在兩個小時內修復該bug,怎麼辦?
幸好,Git還提供了一個stash
功能,可以把當前工作現場“儲藏”起來,等以後恢復現場後繼續工作:
git stash
Saved working directory and index state WIP on master: 1353718 merge with no-ff
現在,用git status
查看工作區,就是乾淨的(除非有沒有被Git管理的文件),因此可以放心地創建分支來修復bug。
首先確定要在哪個分支上修復bug,假定需要在master
分支上修復,就從master
創建臨時分支:
$ git checkout master
Already on 'master'
Your branch is ahead of 'origin/master' by 6 commits.
(use "git push" to publish your local commits)
$ git checkout -b issue-101
Switched to a new branch 'issue-101'
現在修復bug,需要把“Git is free software distributed under the GPL”改爲“Git is a free software distributed under the GPL”,然後提交:
$ git add ReadMe.txt
$ git commit -m "fix bug 101"
[issue-101 ba56780] fix bug 101
1 file changed, 1 insertion(+), 1 deletion(-)
修復完成後,切換到master
分支,並完成合並,最後刪除issue-101
分支:
$ 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)
$ git merge --no-ff -m "merged bug fix 101" issue-101
Merge made by the 'recursive' strategy.
ReadMe.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
太棒了,原計劃兩個小時的bug修復只花了5分鐘!現在,是時候接着回到dev
分支幹活了!
$ git checkout dev
Switched to branch 'dev'
Administrator@WTI32F0K1TGTCP3 MINGW64 /d/Git (dev)
$ git status
On branch dev
Untracked files:
(use "git add <file>..." to include in what will be committed)
gitskills/
nothing added to commit but untracked files present (use "git add" to track)
工作區是乾淨的,剛纔的工作現場存到哪去了?用git stash list
命令看看:
$ git stash list
stash@{0}: WIP on master: 1353718 merge with no-ff
工作現場還在,Git把stash內容存在某個地方了,但是需要恢復一下,有兩個辦法:
一是用git stash apply
恢復,但是恢復後,stash內容並不刪除,你需要用git stash drop
來刪除;
另一種方式是用git stash pop
,恢復的同時把stash內容也刪了:
$ 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.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
gitskills/
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (d2177edb840b74db5212193869b7ae221b57c92f)
再用git stash list
查看,就看不到任何stash內容了:
$ git stash list
你可以多次stash,恢復的時候,先用git stash list
查看,然後恢復指定的stash,用命令:
$ git stash apply stash@{0}
小結
修復bug時,我們會通過創建新的bug分支進行修復,然後合併,最後刪除;
當手頭工作沒有完成時,先把工作現場git stash
一下,然後去修復bug,修復後,再git stash pop
,回到工作現場。