From 6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 30 Dec 2009 15:45:31 +0100 Subject: branch: die explicitly why when calling "git branch [-a|-r] branchname". The -a and -r options used to be silently ignored in such a command. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- builtin-branch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'builtin-branch.c') diff --git a/builtin-branch.c b/builtin-branch.c index 4b4abfd36..7dd51d1fe 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -582,10 +582,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; -- cgit v1.2.1