projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'maint-1.6.2' into maint-1.6.3
[git.git]
/
builtin-branch.c
diff --git
a/builtin-branch.c
b/builtin-branch.c
index 887fa60fa54139eb5e25f801e5b964978db846ab..73101a183eda3d33412fc7951b006425d5d1a10a 100644
(file)
--- a/
builtin-branch.c
+++ b/
builtin-branch.c
@@
-634,10
+634,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);
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);
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;
usage_with_options(builtin_branch_usage, options);
return 0;