From: Beat Bolli <bbolli@ewanet.ch>
Date: Sat, 18 Aug 2012 20:28:00 +0000 (-0700)
Subject: git-gui: remove .git/CHERRY_PICK_HEAD after committing
X-Git-Tag: v1.8.0~1^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a5e4d2599faf51240e5c8f29645eeb2aedff5c2;p=git.git

git-gui: remove .git/CHERRY_PICK_HEAD after committing

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>
---

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 78c5eeb7b..864b68705 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -409,6 +409,7 @@ A rescan will be automatically started now.
 	catch {file delete [gitdir MERGE_MSG]}
 	catch {file delete [gitdir SQUASH_MSG]}
 	catch {file delete [gitdir GITGUI_MSG]}
+	catch {file delete [gitdir CHERRY_PICK_HEAD]}
 
 	# -- Let rerere do its thing.
 	#