On Sat, May 26, 2018 at 11:32:35AM +0900, Junio C Hamano wrote:
> Junio C Hamano <gitster@xxxxxxxxx> writes:
>
> > Yup, thanks for being extra explicit. I do imagine there are quite
> > a few of us who would be puzzled without this update (but with the
> > previous one to unhide it from behind the pager).
>
> With these two patches queued on top of jk/branch-l-0-deprecation,
> the follow-up patches jk/branch-l-1-removal that makes 'branch -l'
> to fail and then jk/branch-l-2-reincarnation that makes 'branch -l'
> a synonym to 'branch --list' needs rebasing. Both are trivial and
> hopefully I did them correctly.
> -- >8 --
> From: Jeff King <peff@xxxxxxxx>
> Date: Mon, 26 Mar 2018 03:29:22 -0400
> Subject: [PATCH] branch: drop deprecated "-l" option
>
> 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.
Thanks. There's one bit missing here, because it did not cause a textual
conflict during the rebase (but it's now dead code). Patch below (to be
squashed to the tip of jk/branch-l-1-removal).
We may also want to fill in <insert sha1 here>. I think it's afc968e579
(branch: deprecate "-l" option, 2018-03-26), which should be stable at
this point (it's already merged to 'next').
diff --git a/builtin/branch.c b/builtin/branch.c
index 01b35b3c3d..f7cd333587 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -34,7 +34,6 @@ static const char * const builtin_branch_usage[] = {
NULL
};
-static int used_deprecated_reflog_option;
static const char *head;
static struct object_id head_oid;
@@ -686,17 +685,6 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (list)
setup_auto_pager("branch", 1);
- if (used_deprecated_reflog_option) {
- if (list) {
- warning("the '-l' option is an alias for '--create-reflog' and");
- warning("has no effect in list mode. This option will soon be");
- warning("removed and you should omit it (or use '--list' instead).");
- } else {
- 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"));
