From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Subject: Re: [PATCH v2 4/4] branch: make "-l" a synonym for "--list"
Date: Thu, 30 Aug 2018 10:58:27 +0200 [thread overview]
Message-ID: <87wos8cjt8.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20180622092459.GD13573@sigill.intra.peff.net>
On Fri, Jun 22 2018, Jeff King wrote:
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> index 1072ca0eb6..fc88e984e1 100644
> --- a/Documentation/git-branch.txt
> +++ b/Documentation/git-branch.txt
> @@ -100,8 +100,6 @@ OPTIONS
> The negated form `--no-create-reflog` only overrides an earlier
> `--create-reflog`, but currently does not negate the setting of
> `core.logAllRefUpdates`.
> -+
> -The `-l` option is a deprecated synonym for `--create-reflog`.
>
> -f::
> --force::
> @@ -156,6 +154,7 @@ This option is only applicable in non-verbose mode.
> --all::
> List both remote-tracking branches and local branches.
>
> +-l::
> --list::
> List branches. With optional `<pattern>...`, e.g. `git
> branch --list 'maint-*'`, list only the branches that match
I think it's better to have something like this on top:
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 5552dfcec3..a03cb1ebc9 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -163,6 +163,11 @@ This option is only applicable in non-verbose mode.
This should not be confused with `git branch -l <branchname>`,
which creates a branch named `<branchname>` with a reflog.
See `--create-reflog` above for details.
++
+
+Until Git version 2.20 `-l` was the short form of
+`--create-reflog`. As of version 2.19 using it would warn about a
+future deprecation.
-v::
-vv::
We're about to release 2.19 with the deprecation (but it still means
--create-reflog), this patch is sitting in next.
Similarly to your 2/4 we'll have some scripts in the wild using -l,
let's at least give them a headsup that this changed in the docs, as
well as anyone on >=2.20 (or whenever we plan to merge this down from
next) a warning that if they're writing some script they can't rely on
`-l` for older clients.
next prev parent reply other threads:[~2018-08-30 8:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-22 9:23 [PATCH v2 0/4] branch -l deprecation revisited Jeff King
2018-06-22 9:23 ` [PATCH v2 1/4] t3200: unset core.logallrefupdates when testing reflog creation Jeff King
2018-06-22 9:23 ` [PATCH v2 2/4] t: switch "branch -l" to "branch --create-reflog" Jeff King
2018-06-22 9:24 ` [PATCH v2 3/4] branch: deprecate "-l" option Jeff King
2018-06-22 22:34 ` Eric Sunshine
2018-06-22 22:43 ` Jeff King
2018-06-22 9:24 ` [PATCH v2 4/4] branch: make "-l" a synonym for "--list" Jeff King
2018-08-30 8:58 ` Ævar Arnfjörð Bjarmason [this message]
2018-08-30 18:48 ` Junio C Hamano
2018-08-30 19:53 ` Ævar Arnfjörð Bjarmason
2018-08-30 20:04 ` Jeff King
2018-08-30 20:29 ` Junio C Hamano
2018-08-30 20:50 ` Jeff King
2018-08-30 21:07 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wos8cjt8.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).