log: show merge commit when --cc is given

diff --git a/branch.c b/branch.c
index c85be0785b066380241aa66ff3d57155824fb226..3364adf1821b9a8b9bb0d81e8f1987f611eecdbc 100644 (file)
--- a/branch.c
+++ b/branch.c
@@ -302,13 +302,13 @@ void create_branch(const char *head,
 
 void remove_branch_state(void)
 {
-       unlink(git_path("CHERRY_PICK_HEAD"));
-       unlink(git_path("REVERT_HEAD"));
-       unlink(git_path("MERGE_HEAD"));
-       unlink(git_path("MERGE_RR"));
-       unlink(git_path("MERGE_MSG"));
-       unlink(git_path("MERGE_MODE"));
-       unlink(git_path("SQUASH_MSG"));
+       unlink(git_path_cherry_pick_head());
+       unlink(git_path_revert_head());
+       unlink(git_path_merge_head());
+       unlink(git_path_merge_rr());
+       unlink(git_path_merge_msg());
+       unlink(git_path_merge_mode());
+       unlink(git_path_squash_msg());
 }
 
 static void check_linked_checkout(const char *branch, const char *id)