diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-01 06:06:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-01 06:06:38 (GMT) |
| commit | e1149fd7d95e3b63f56d4360e135428fc3f7eb82 (patch) | |
| tree | 21a585696e84b23bdc087ae87e85278c1f22b754 /builtin/branch.c | |
| parent | 2bd108ff65031b79d191cfa491fa676ca67e7788 (diff) | |
| parent | 3e4a67b47d020c8c61d8a762d1903f5288e94778 (diff) | |
| download | git-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.zip git-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.tar.gz git-e1149fd7d95e3b63f56d4360e135428fc3f7eb82.tar.bz2 | |
Merge branch 'nd/use-opt-int-set-f'
Code simplification.
* nd/use-opt-int-set-f:
Use OPT_SET_INT_F() for cmdline option specification
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 5bb5123..d53f6e2 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -592,8 +592,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT__QUIET(&quiet, N_("suppress informational messages")), OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"), BRANCH_TRACK_EXPLICIT), - { OPTION_SET_INT, 0, "set-upstream", &track, NULL, N_("do not use"), - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, BRANCH_TRACK_OVERRIDE }, + OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"), + BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN), OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")), OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")), OPT__COLOR(&branch_use_color, N_("use colored output")), |