git-gui: corrected setup of git worktree under cygwin.

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 78c5eeb7bce943258ce58a1933a29686bd5963d0..864b687057c9759f2b06a9a83e3ca18c51113d92 100644 (file)
--- 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.
        #