Merge branch 'maint-1.6.1' into maint-1.6.2

[git.git] / builtin-branch.c

diff --git a/builtin-branch.c b/builtin-branch.c
index 07166b8856b2a2637a55b20221a929d6dbea1e0c..74c404bd3f72d8931d42c3ecd841e25a5b2edec1 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -560,10 +560,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                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 (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,
                              force_create, reflog, track);
-       else
+       } else
                usage_with_options(builtin_branch_usage, options);
 
        return 0;