X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=branch.c;h=d62cc0132cbff6de04b69864279d6c92f9e95e0a;hb=fb630e048c6efabe4d46b1b125fe7348062d38e6;hp=da5c03e56545b79cb92dd850ed09e81c21f9162f;hpb=bac9c06ba093d9254cb2ab3eed074722a3e635a6;p=git.git

diff --git a/branch.c b/branch.c
index da5c03e56..d62cc0132 100644
--- a/branch.c
+++ b/branch.c
@@ -210,7 +210,7 @@ void create_branch(const char *head,
 			 start_name);
 
 	if (real_ref && track)
-		setup_tracking(name, real_ref, track);
+		setup_tracking(ref.buf+11, real_ref, track);
 
 	if (!dont_change_ref)
 		if (write_ref_sha1(lock, sha1, msg) < 0)
@@ -222,6 +222,7 @@ void create_branch(const char *head,
 
 void remove_branch_state(void)
 {
+	unlink(git_path("CHERRY_PICK_HEAD"));
 	unlink(git_path("MERGE_HEAD"));
 	unlink(git_path("MERGE_RR"));
 	unlink(git_path("MERGE_MSG"));