On Tue, Jun 04, 2024 at 03:01:44PM -0700, Junio C Hamano wrote: > diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c > index 65fb22a8a2..69841ed49f 100644 > --- a/builtin/ls-remote.c > +++ b/builtin/ls-remote.c > @@ -9,7 +9,7 @@ > #include "wildmatch.h" > > static const char * const ls_remote_usage[] = { > - N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" > + N_("git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n" > " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" > " [--symref] [<repository> [<patterns>...]]"), > NULL > @@ -68,7 +68,10 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) > N_("path of git-upload-pack on the remote host"), > PARSE_OPT_HIDDEN }, > OPT_BIT('t', "tags", &flags, N_("limit to tags"), REF_TAGS), > - OPT_BIT('h', "heads", &flags, N_("limit to heads"), REF_BRANCHES), > + OPT_BIT('b', "branches", &flags, N_("limit to branches"), REF_BRANCHES), > + OPT_BIT_F('h', "heads", &flags, > + N_("deprecated synonym for --branches"), REF_BRANCHES, > + PARSE_OPT_HIDDEN), > OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL), > OPT_BOOL(0, "get-url", &get_url, > N_("take url.<base>.insteadOf into account")), > diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh > index 5dbe107ce8..42e77eb5a9 100755 > --- a/t/t5512-ls-remote.sh > +++ b/t/t5512-ls-remote.sh > @@ -47,6 +47,7 @@ test_expect_success setup ' > git show-ref -d >refs && > sed -e "s/ / /" refs >>expected.all && > > + grep refs/heads/ expected.all >expected.branches && > git remote add self "$(pwd)/.git" && > git remote add self2 "." > ' > @@ -71,6 +72,27 @@ test_expect_success 'ls-remote self' ' > test_cmp expected.all actual > ' > > +test_expect_success 'ls-remote --branches self' ' > + git ls-remote --branches self >actual && > + test_cmp expected.branches actual && > + git ls-remote -b self >actual && > + test_cmp expected.branches actual > +' > + > +test_expect_success 'ls-remote -h is deprecated w/o warning' ' > + git ls-remote -h self >actual 2>warning && > + test_cmp expected.branches actual && > + test_grep ! deprecated warning > +' It is a bit funny to grep for something that wasn't ever there. But I don't mind it much as we may eventually want to introduce such a deprecation warning if we ever decide to go through with the deprecation. Patrick
Attachment:
signature.asc
Description: PGP signature