diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:49:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:49:47 -0800 |
| commit | c5034673fd92b6278e6c9d55683770ec01fafc89 (patch) | |
| tree | 04435179aa4d3dfb0b2ac746072731929d7adcf1 /builtin-branch.c | |
| parent | 405923761a8cd12d0047c215b69df9c6aa96723e (diff) | |
| parent | 96aa7adda3b0254e4b9904f53bb38cd76bfea7bb (diff) | |
| download | git-c5034673fd92b6278e6c9d55683770ec01fafc89.tar.gz | |
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
textconv: stop leaking file descriptors
commit: --cleanup is a message option
git count-objects: handle packs bigger than 4G
t7102: make the test fail if one of its check fails
Conflicts:
diff.c
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 07166b8856..74c404bd3f 100644 --- 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; |