git-gui: remove .git/CHERRY_PICK_HEAD after committing

bbolli · patthoyts · commit 5a5e4d2599fa · 2012-09-17T11:59:05.000+01:00
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 &lt;bbolli@ewanet.ch&gt;
Signed-off-by: Pat Thoyts &lt;patthoyts@users.sourceforge.net&gt;
diff --git 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.
 	#

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,7 @@ A rescan will be automatically started now.`
`409`	`409`	`catch {file delete [gitdir MERGE_MSG]}`
`410`	`410`	`catch {file delete [gitdir SQUASH_MSG]}`
`411`	`411`	`catch {file delete [gitdir GITGUI_MSG]}`
	`412`	`+ catch {file delete [gitdir CHERRY_PICK_HEAD]}`
`412`	`413`
`413`	`414`	`# -- Let rerere do its thing.`
`414`	`415`	`#`