X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fbranch.c;h=51ca6a02d7433f1394de10a7f6ef1aa565ac03e2;hb=35a71f1402b40b580d985a9d7e5fb1c9ec4d0232;hp=009b7138ac72c5845225ce1f801be908ede4e3b4;hpb=e283548b85791fad6752e03cc15c6271b80c5fae;p=git.git

diff --git a/builtin/branch.c b/builtin/branch.c
index 009b7138a..51ca6a02d 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -719,11 +719,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	else if (list)
 		return print_ref_list(kinds, detached, verbose, abbrev,
 				      with_commit, argv);
-	else if (rename && (argc == 1))
-		rename_branch(head, argv[0], rename > 1);
-	else if (rename && (argc == 2))
-		rename_branch(argv[0], argv[1], rename > 1);
-	else if (argc <= 2) {
+	else if (rename) {
+		if (argc == 1)
+			rename_branch(head, argv[0], rename > 1);
+		else if (argc == 2)
+			rename_branch(argv[0], argv[1], rename > 1);
+		else
+			usage_with_options(builtin_branch_usage, options);
+	} else if (argc <= 2) {
 		if (kinds != REF_LOCAL_BRANCH)
 			die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
 		create_branch(head, argv[0], (argc == 2) ? argv[1] : head,