From: Matthieu Moy Date: Thu, 17 Sep 2009 09:35:28 GMT Subject: [RFC/PATCH] branch: die when calling "git branch [-a|-r] branchname". Message-ID: <1253180128-670-1-git-send-email-Matthieu.Moy@imag.fr> Signed-off-by: Matthieu Moy --- builtin-branch.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin-branch.c b/builtin-branch.c index 9f57992..fe11b55 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -635,10 +635,13 @@ 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 or -r do not make sense with 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; -- 1.6.5.rc1.11.g2d184.dirty