builtin/branch: consolidate action-picking logic in cmd_branch()
Consolidate the logic for deciding when to create a new branch in cmd_branch(), and save the result for reuse. Besides making the function more explicit, this allows us to validate options that can only be used when creating a branch. Such an option does not exist yet, but one will be introduced in a subsequent commit. Helped-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Glen Choo <chooglen@google.com> Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Glen Choo committed
Jan 28, 2022 at 16:04 UTC
6e0a2ca0277e6010cd403c70d8f15b66af345d33
1 file changed
+11
-8
builtin/branch.c
+11
-8
@@ -616,14 +616,15 @@ static int edit_branch_description(const char *branch_name)
616
617
int cmd_branch(int argc, const char **argv, const char *prefix)
618
{
619
- int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
620
- int show_current = 0;
621
- int reflog = 0, edit_description = 0;
622
- int quiet = 0, unset_upstream = 0;
619
+ /* possible actions */
620
+ int delete = 0, rename = 0, copy = 0, list = 0,
621
+ unset_upstream = 0, show_current = 0, edit_description = 0;
622
const char *new_upstream = NULL;
623
+ int noncreate_actions = 0;
624
+ /* possible options */
625
+ int reflog = 0, quiet = 0, icase = 0, force = 0;
626
enum branch_track track;
627
struct ref_filter filter;
626
- int icase = 0;
628
static struct ref_sorting *sorting;
629
struct string_list sorting_options = STRING_LIST_INIT_DUP;
630
struct ref_format format = REF_FORMAT_INIT;
@@ -708,8 +709,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
709
filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
710
list = 1;
711
711
- if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
712
- list + edit_description + unset_upstream > 1)
712
+ noncreate_actions = !!delete + !!rename + !!copy + !!new_upstream +
713
+ !!show_current + !!list + !!edit_description +
714
+ !!unset_upstream;
715
+ if (noncreate_actions > 1)
716
usage_with_options(builtin_branch_usage, options);
717
718
if (filter.abbrev == -1)
@@ -849,7 +852,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
852
strbuf_addf(&buf, "branch.%s.merge", branch->name);
853
git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
854
strbuf_release(&buf);
852
- } else if (argc > 0 && argc <= 2) {
855
+ } else if (!noncreate_actions && argc > 0 && argc <= 2) {
856
if (filter.kind != FILTER_REFS_BRANCHES)
857
die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
858
"Did you mean to use: -a|-r --list <pattern>?"));