Skip to content

Commit 10f102b

Browse files
pcloudsgitster
authored andcommitted
checkout: pass whole struct to parse_branchname_arg instead of individual flags
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent df56607 commit 10f102b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

builtin/checkout.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,12 @@ static void check_linked_checkouts(struct branch_info *new)
10791079
static int parse_branchname_arg(int argc, const char **argv,
10801080
int dwim_new_local_branch_ok,
10811081
struct branch_info *new,
1082-
struct tree **source_tree,
1083-
unsigned char rev[20],
1084-
const char **new_branch,
1085-
int force_detach)
1082+
struct checkout_opts *opts,
1083+
unsigned char rev[20])
10861084
{
1085+
struct tree **source_tree = &opts->source_tree;
1086+
const char **new_branch = &opts->new_branch;
1087+
int force_detach = opts->force_detach;
10871088
int argcount = 0;
10881089
unsigned char branch_rev[20];
10891090
const char *arg;
@@ -1420,9 +1421,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
14201421
opts.track == BRANCH_TRACK_UNSPECIFIED &&
14211422
!opts.new_branch;
14221423
int n = parse_branchname_arg(argc, argv, dwim_ok,
1423-
&new, &opts.source_tree,
1424-
rev, &opts.new_branch,
1425-
opts.force_detach);
1424+
&new, &opts, rev);
14261425
argv += n;
14271426
argc -= n;
14281427
}

0 commit comments

Comments
 (0)