summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-17 04:48:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-09-17 04:48:10 (GMT)
commitc103e9529c8a95b5acf4747cfe06b2f6adedab71 (patch)
treec57aadfd0da7010b5a916e21dd3b4d239b28ac62 /builtin/branch.c
parent26e4266f2fee3454370885ff480b38d045ca1731 (diff)
parentfa79937675600ad5dda5031c532097a0461d843e (diff)
downloadgit-c103e9529c8a95b5acf4747cfe06b2f6adedab71.zip
git-c103e9529c8a95b5acf4747cfe06b2f6adedab71.tar.gz
git-c103e9529c8a95b5acf4747cfe06b2f6adedab71.tar.bz2
Merge branch 'ci/forbid-unwanted-current-branch-update'
* ci/forbid-unwanted-current-branch-update: branch --set-upstream: regression fix
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index aa705a0..f49596f 100644
--- 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);