From 5a5e4d2599faf51240e5c8f29645eeb2aedff5c2 Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Sat, 18 Aug 2012 13:28:00 -0700 Subject: [PATCH] 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 Signed-off-by: Pat Thoyts --- lib/commit.tcl | 1 + 1 file changed, 1 insertion(+) 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. # -- 2.26.2