undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: remove .git/CHERRY_PICK_HEAD after committing

Browse Source 
Adding _git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the "|CHERRY-PICKING" flag.

Delete the file causing this flag when cleaning up.

Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Beat Bolli 2012-08-18 13:28:00 -07:00 committed by Pat Thoyts
parent 9ef750875a
commit 5a5e4d2599
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/commit.tcl
View File

@ -409,6 +409,7 @@ A rescan will be automatically started now.
catch {file delete [gitdir MERGE_MSG]} catch {file delete [gitdir MERGE_MSG]}
catch {file delete [gitdir SQUASH_MSG]} catch {file delete [gitdir SQUASH_MSG]}
catch {file delete [gitdir GITGUI_MSG]} catch {file delete [gitdir GITGUI_MSG]}
catch {file delete [gitdir CHERRY_PICK_HEAD]}
# -- Let rerere do its thing. # -- Let rerere do its thing.
# #