Sync with maint

diff --git a/builtin/branch.c b/builtin/branch.c
index e09ce51c2ee59ee4a9f44dbf43c97a2d31911b7b..3f0fbc082aef95b3d02a8b677116264eea892369 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -904,7 +904,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                if (edit_branch_description(branch_name))
                        return 1;
        } else if (rename) {
-               if (argc == 1)
+               if (!argc)
+                       die(_("branch name required"));
+               else if (argc == 1)
                        rename_branch(head, argv[0], rename > 1);
                else if (argc == 2)
                        rename_branch(argv[0], argv[1], rename > 1);