diff options
| author | Jeff King <peff@peff.net> | 2018-03-26 03:29:22 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-26 14:06:09 -0700 |
| commit | a60e04aee3c3d536d2715fd8f4c153f9ea5e5eef (patch) | |
| tree | 0a176e780978249007720990042ff7cfef741359 | |
| parent | afc968e57995e94b16699a8506db47f83575d6bc (diff) | |
| download | git-jk/branch-l-1-removal.tar.gz | |
branch: drop deprecated "-l" optionjk/branch-l-1-removal
We marked the "-l" option as deprecated back in <insert sha1
here>. Now that sufficient time has passed, let's follow
through and get rid of it.
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/branch.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index e50a5a1680..f7cd333587 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -570,15 +570,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) -{ - warning("the '-l' alias for '--create-reflog' is deprecated;"); - warning("it will be removed in a future version of Git"); - *(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; @@ -622,12 +613,6 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_BIT('C', NULL, ©, N_("copy a branch, even if target exists"), 2), OPT_BOOL(0, "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), |