checkout: pass whole struct to parse_branchname_arg instead of individual flags
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jan 3, 2015 at 16:41 UTC
10f102be211cf1ba61c983fb463665147052daa9
1 file changed
+6
-7
builtin/checkout.c
+6
-7
@@ -1079,11 +1079,12 @@ static void check_linked_checkouts(struct branch_info *new)
1079
static int parse_branchname_arg(int argc, const char **argv,
1080
int dwim_new_local_branch_ok,
1081
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])
1084
{
1085
+ struct tree **source_tree = &opts->source_tree;
1086
+ const char **new_branch = &opts->new_branch;
1087
+ int force_detach = opts->force_detach;
1088
int argcount = 0;
1089
unsigned char branch_rev[20];
1090
const char *arg;
@@ -1420,9 +1421,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
1421
opts.track == BRANCH_TRACK_UNSPECIFIED &&
1422
!opts.new_branch;
1423
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);
1425
argv += n;
1426
argc -= n;
1427
}