diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:50 +0300 |
| commit | 7dc341cedb66746710ce51ac5f8416089445c448 (patch) | |
| tree | 13440752a45c79a667ae8e9e2f7d98bb69f7141f /builtin/branch.c | |
| parent | 4dd0c4a44cf9500f3197062da1a82a83a867fb94 (diff) | |
| parent | 94a13806fbce47de1468a49599ecb901d967aacc (diff) | |
Merge branch 'jk/branch-l-1-repurpose'
Updated plan to repurpose the "-l" option to "git branch".
* jk/branch-l-1-repurpose:
doc/git-branch: remove obsolete "-l" references
branch: make "-l" a synonym for "--list"
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index bbd006aab4b..5b4d883e1f6 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -37,7 +37,6 @@ static const char * const builtin_branch_usage[] = { static const char *head; static struct object_id head_oid; -static int used_deprecated_reflog_option; static int branch_use_color = -1; static char branch_colors[][COLOR_MAXLEN] = { @@ -578,14 +577,6 @@ static int edit_branch_description(const char *branch_name) return 0; } -static int deprecated_reflog_option_cb(const struct option *opt, - const char *arg, int unset) -{ - used_deprecated_reflog_option = 1; - *(int *)opt->value = !unset; - return 0; -} - int cmd_branch(int argc, const char **argv, const char *prefix) { int delete = 0, rename = 0, copy = 0, force = 0, list = 0; @@ -627,14 +618,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2), OPT_BIT('c', "copy", ©, N_("copy a branch and its reflog"), 1), OPT_BIT('C', NULL, ©, N_("copy a branch, even if target exists"), 2), - OPT_BOOL(0, "list", &list, N_("list branch names")), + OPT_BOOL('l', "list", &list, N_("list branch names")), OPT_BOOL(0, "create-reflog", &reflog, N_("create the branch's reflog")), - { - OPTION_CALLBACK, 'l', NULL, &reflog, NULL, - N_("deprecated synonym for --create-reflog"), - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, - deprecated_reflog_option_cb - }, OPT_BOOL(0, "edit-description", &edit_description, N_("edit the description for the branch")), OPT__FORCE(&force, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE), @@ -707,11 +692,6 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (list) setup_auto_pager("branch", 1); - if (used_deprecated_reflog_option && !list) { - warning("the '-l' alias for '--create-reflog' is deprecated;"); - warning("it will be removed in a future version of Git"); - } - if (delete) { if (!argc) die(_("branch name required")); |