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>
Beat Bolli committed
Aug 18, 2012 at 13:28 UTC
5a5e4d2599faf51240e5c8f29645eeb2aedff5c2
1 file changed
+1
lib/commit.tcl
+1
@@ -409,6 +409,7 @@ A rescan will be automatically started now.
409
catch {file delete [gitdir MERGE_MSG]}
410
catch {file delete [gitdir SQUASH_MSG]}
411
catch {file delete [gitdir GITGUI_MSG]}
412
+ catch {file delete [gitdir CHERRY_PICK_HEAD]}
413
414
# -- Let rerere do its thing.
415
#