diff --git a/branch.c b/branch.c
index da5c03e56545b79cb92dd850ed09e81c21f9162f..d62cc0132cbff6de04b69864279d6c92f9e95e0a 100644 (file)
--- a/branch.c
+++ b/branch.c
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)
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"));