Merge branch 'ci/forbid-unwanted-current-branch-update'

* ci/forbid-unwanted-current-branch-update: branch --set-upstream: regression fix
2011-09-16 21:48:10 -07:00
parent 26e4266f2f fa79937675
commit c103e9529c
5 changed files with 39 additions and 12 deletions
--- a/builtin/branch.c
+++ b/builtin/branch.c
@ -566,7 +566,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
 			die(_("Invalid branch name: '%s'"), oldname);
 	}

-	validate_new_branchname(newname, &newref, force);
+	validate_new_branchname(newname, &newref, force, 0);

 	strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 		 oldref.buf, newref.buf);