X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=branch.c;h=93dc866f8c09a2da2308c4fd677178b043f2d4d5;hb=7e4eb210bdf2a612d8bf4cc106d99ba190f73e3e;hp=9e1f63ed8dbe8b087f99292880059642d9744697;hpb=712d352577012d5035da69bbf49ea0f0df8bb7da;p=git.git diff --git a/branch.c b/branch.c index 9e1f63ed8..93dc866f8 100644 --- a/branch.c +++ b/branch.c @@ -159,7 +159,7 @@ void create_branch(const char *head, dont_change_ref = 1; else if (!force) die("A branch named '%s' already exists.", name); - else if (!is_bare_repository() && !strcmp(head, name)) + else if (!is_bare_repository() && head && !strcmp(head, name)) die("Cannot force update the current branch."); forcing = 1; } @@ -198,7 +198,7 @@ void create_branch(const char *head, log_all_ref_updates = 1; if (forcing) - snprintf(msg, sizeof msg, "branch: Reset from %s", + snprintf(msg, sizeof msg, "branch: Reset to %s", start_name); else if (!dont_change_ref) snprintf(msg, sizeof msg, "branch: Created from %s",