git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
* Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
@ 2019-05-18 15:16 Philip Oakley
  2019-05-18 18:37 ` Ævar Arnfjörð Bjarmason
  0 siblings, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-18 15:16 UTC (permalink / raw)
  To: Git Mailing List

Hi,
I'm unsure if there is a command for this.

Currently I have 1600+ remote tracking branches (rtb) for my Git repo as 
it covers both git.git and git-for-windows and some other contributors.

Finding a specific rtb for a particular remote looks like there ought to 
be a simple command ready to do the job, but I haven't found anything.

Is there a command or simple simple invocation of branch, show-ref, 
for-each-ref, etc that can be give a branch pattern and remote name to 
quickly filter down the list of potential branches to just one or two 
24-line screens?

-- 
Philip


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
  2019-05-18 15:16 Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's) Philip Oakley
@ 2019-05-18 18:37 ` Ævar Arnfjörð Bjarmason
  2019-05-18 19:44   ` Philip Oakley
                     ` (2 more replies)
  0 siblings, 3 replies; 16+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2019-05-18 18:37 UTC (permalink / raw)
  To: Philip Oakley; +Cc: Git Mailing List


On Sat, May 18 2019, Philip Oakley wrote:

> Hi,
> I'm unsure if there is a command for this.
>
> Currently I have 1600+ remote tracking branches (rtb) for my Git repo
> as it covers both git.git and git-for-windows and some other
> contributors.
>
> Finding a specific rtb for a particular remote looks like there ought
> to be a simple command ready to do the job, but I haven't found
> anything.
>
> Is there a command or simple simple invocation of branch, show-ref,
> for-each-ref, etc that can be give a branch pattern and remote name to
> quickly filter down the list of potential branches to just one or two
> 24-line screens?

That's:

    git for-each-ref 'refs/remotes/<remote>/<pattern>'
    git branch -a -l '<remote>/<pattern>'

The latter will conflate <remote> with any local branches you happen to
have prefixed with <remote>.

The reason this isn't some easy mode in some command is because there's
no hard notion that a given remote "owns" a given set of RTB's. It's
just convention, but they can and do overlap sometimes.

See the logic in 'git remote remove' that needs to decide if a deletion
of a remote should delete its remote tracking refs: 7ad2458fad ("Make
"git-remote rm" delete refs acccording to fetch specs", 2008-06-01)

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
  2019-05-18 18:37 ` Ævar Arnfjörð Bjarmason
@ 2019-05-18 19:44   ` Philip Oakley
  2019-05-19  3:07     ` Duy Nguyen
  2019-05-19  3:05   ` Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's) Duy Nguyen
  2019-05-28 13:57   ` Junio C Hamano
  2 siblings, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-18 19:44 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: Git Mailing List

Hi Ævar,

On 18/05/2019 19:37, Ævar Arnfjörð Bjarmason wrote:
> On Sat, May 18 2019, Philip Oakley wrote:
>
>> Hi,
>> I'm unsure if there is a command for this.
>>
>> Currently I have 1600+ remote tracking branches (rtb) for my Git repo
>> as it covers both git.git and git-for-windows and some other
>> contributors.
>>
>> Finding a specific rtb for a particular remote looks like there ought
>> to be a simple command ready to do the job, but I haven't found
>> anything.
>>
>> Is there a command or simple simple invocation of branch, show-ref,
>> for-each-ref, etc that can be give a branch pattern and remote name to
>> quickly filter down the list of potential branches to just one or two
>> 24-line screens?
> That's:
>
>      git for-each-ref 'refs/remotes/<remote>/<pattern>'
>      git branch -a -l '<remote>/<pattern>'
>
> The latter will conflate <remote> with any local branches you happen to
> have prefixed with <remote>.
>
> The reason this isn't some easy mode in some command is because there's
> no hard notion that a given remote "owns" a given set of RTB's. It's
> just convention, but they can and do overlap sometimes.
>
> See the logic in 'git remote remove' that needs to decide if a deletion
> of a remote should delete its remote tracking refs: 7ad2458fad ("Make
> "git-remote rm" delete refs acccording to fetch specs", 2008-06-01)
Thanks, that's magic. I was also conflating the 'pattern' with a grep 
style sub-string search in my exploration.

So, as long as one uses the RTB 'remote name', rather than the remotes 
'remote name' it should all be golden.

I'll add the answer to one on the stackoverflow Q&A's I'd looked at. I 
hadn't put the branch -a and -l options together.
--
Philip

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
  2019-05-18 18:37 ` Ævar Arnfjörð Bjarmason
  2019-05-18 19:44   ` Philip Oakley
@ 2019-05-19  3:05   ` Duy Nguyen
  2019-05-28 13:57   ` Junio C Hamano
  2 siblings, 0 replies; 16+ messages in thread
From: Duy Nguyen @ 2019-05-19  3:05 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: Philip Oakley, Git Mailing List

On Sun, May 19, 2019 at 1:41 AM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> That's:
>
>     git for-each-ref 'refs/remotes/<remote>/<pattern>'
>     git branch -a -l '<remote>/<pattern>'
>
> The latter will conflate <remote> with any local branches you happen to
> have prefixed with <remote>.

That problem should be gone if you use -r instead of -a.
-- 
Duy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
  2019-05-18 19:44   ` Philip Oakley
@ 2019-05-19  3:07     ` Duy Nguyen
  2019-05-19  9:49       ` Philip Oakley
  2019-05-28 12:13       ` [PATCH] doc branch: provide examples for listing remote tracking branches Philip Oakley
  0 siblings, 2 replies; 16+ messages in thread
From: Duy Nguyen @ 2019-05-19  3:07 UTC (permalink / raw)
  To: Philip Oakley; +Cc: Ævar Arnfjörð Bjarmason, Git Mailing List

On Sun, May 19, 2019 at 2:55 AM Philip Oakley <philipoakley@iee.org> wrote:
> I'll add the answer to one on the stackoverflow Q&A's I'd looked at. I
> hadn't put the branch -a and -l options together.

Maybe update/add some examples in our man pages too.
-- 
Duy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
  2019-05-19  3:07     ` Duy Nguyen
@ 2019-05-19  9:49       ` Philip Oakley
  2019-05-28 12:13       ` [PATCH] doc branch: provide examples for listing remote tracking branches Philip Oakley
  1 sibling, 0 replies; 16+ messages in thread
From: Philip Oakley @ 2019-05-19  9:49 UTC (permalink / raw)
  To: Duy Nguyen; +Cc: Ævar Arnfjörð Bjarmason, Git Mailing List


On 19/05/2019 04:07, Duy Nguyen wrote:
> On Sun, May 19, 2019 at 2:55 AM Philip Oakley <philipoakley@iee.org> wrote:
>> I'll add the answer to one on the stackoverflow Q&A's I'd looked at. I
>> hadn't put the branch -a and -l options together.
> Maybe update/add some examples in our man pages too.
deffo on an update! For the -r option I did not expect to be able to add 
a remote name (no option listed, nor method noted).

Just re-read the branch(1) man page and much of it is buried in the 
first paragraph with/for the --list option with lots of caveats and 
pairings.
--
Philip

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH] doc branch: provide examples for listing remote tracking branches
  2019-05-19  3:07     ` Duy Nguyen
  2019-05-19  9:49       ` Philip Oakley
@ 2019-05-28 12:13       ` Philip Oakley
  2019-05-28 13:58         ` Junio C Hamano
  1 sibling, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-28 12:13 UTC (permalink / raw)
  To: GitList

The availability of these pattern selections is not obvious from
the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.

Provide examples.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---

in response to 
<CACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S+hiXBoUGQ@mail.gmail.com>
https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E

to: "Git Mailing List <git@vger.kernel.org>"
cc: "Duy Nguyen <pclouds@gmail.com>"
cc: "Ævar Arnfjörð Bjarmason <avarab@gmail.com>"

 Documentation/git-branch.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 3bd83a7cbd..7ed91f1be3 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -314,6 +314,18 @@ $ git branch -D test                                    <2>
 <2> Delete the "test" branch even if the "master" branch (or whichever branch
     is currently checked out) does not have all commits from the test branch.
 
+Listing branches from a specific remote::
++
+------------
+$ git branch -a -l '<remote>/<pattern>'                 <1>
+$ git for-each-ref 'refs/remotes/<remote>/<pattern>'    <2>
+------------
++
+<1> This can conflate <remote> with any local branches you happen to
+    have been prefixed with the same <remote> pattern.
+<2> `for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]
+
+Patterns will normally need quoting.
 
 NOTES
 -----
-- 
2.22.0.rc1.windows.1


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's)
  2019-05-18 18:37 ` Ævar Arnfjörð Bjarmason
  2019-05-18 19:44   ` Philip Oakley
  2019-05-19  3:05   ` Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's) Duy Nguyen
@ 2019-05-28 13:57   ` Junio C Hamano
  2 siblings, 0 replies; 16+ messages in thread
From: Junio C Hamano @ 2019-05-28 13:57 UTC (permalink / raw)
  To: Ævar Arnfjörð Bjarmason; +Cc: Philip Oakley, Git Mailing List

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> That's:
>
>     git for-each-ref 'refs/remotes/<remote>/<pattern>'
>     git branch -a -l '<remote>/<pattern>'
>
> The latter will conflate <remote> with any local branches you happen to
> have prefixed with <remote>.

Wouldn't "branch -r -l <remote>/<pattern>" be without that downside?
Why use "-a"?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH] doc branch: provide examples for listing remote tracking branches
  2019-05-28 12:13       ` [PATCH] doc branch: provide examples for listing remote tracking branches Philip Oakley
@ 2019-05-28 13:58         ` Junio C Hamano
  2019-05-28 14:17           ` Philip Oakley
  0 siblings, 1 reply; 16+ messages in thread
From: Junio C Hamano @ 2019-05-28 13:58 UTC (permalink / raw)
  To: Philip Oakley; +Cc: GitList

Philip Oakley <philipoakley@iee.org> writes:

> The availability of these pattern selections is not obvious from
> the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.
>
> Provide examples.
>
> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---

Please try again, perhaps after reading
<CACsJy8B_3ZytR+5HvOax=ngw7ECse8_5ajkOvUEcOj3MuNxQvQ@mail.gmail.com>

Thanks.

>
> in response to 
> <CACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S+hiXBoUGQ@mail.gmail.com>
> https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E
>
> to: "Git Mailing List <git@vger.kernel.org>"
> cc: "Duy Nguyen <pclouds@gmail.com>"
> cc: "Ævar Arnfjörð Bjarmason <avarab@gmail.com>"
>
>  Documentation/git-branch.txt | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> index 3bd83a7cbd..7ed91f1be3 100644
> --- a/Documentation/git-branch.txt
> +++ b/Documentation/git-branch.txt
> @@ -314,6 +314,18 @@ $ git branch -D test                                    <2>
>  <2> Delete the "test" branch even if the "master" branch (or whichever branch
>      is currently checked out) does not have all commits from the test branch.
>  
> +Listing branches from a specific remote::
> ++
> +------------
> +$ git branch -a -l '<remote>/<pattern>'                 <1>
> +$ git for-each-ref 'refs/remotes/<remote>/<pattern>'    <2>
> +------------
> ++
> +<1> This can conflate <remote> with any local branches you happen to
> +    have been prefixed with the same <remote> pattern.
> +<2> `for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]
> +
> +Patterns will normally need quoting.
>  
>  NOTES
>  -----

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH] doc branch: provide examples for listing remote tracking branches
  2019-05-28 13:58         ` Junio C Hamano
@ 2019-05-28 14:17           ` Philip Oakley
  2019-05-28 14:51             ` Philip Oakley
  0 siblings, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-28 14:17 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: GitList

On 28/05/2019 14:58, Junio C Hamano wrote:
> Philip Oakley <philipoakley@iee.org> writes:
>
>> The availability of these pattern selections is not obvious from
>> the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.
>>
>> Provide examples.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>> ---
> Please try again, perhaps after reading
> <CACsJy8B_3ZytR+5HvOax=ngw7ECse8_5ajkOvUEcOj3MuNxQvQ@mail.gmail.com>
Hi Junio
Sorry, I'm not understanding the comment, even having re-read the thread.
Philip
>
> Thanks.
>
>> in response to
>> <CACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S+hiXBoUGQ@mail.gmail.com>
>> https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E
>>
>> to: "Git Mailing List <git@vger.kernel.org>"
>> cc: "Duy Nguyen <pclouds@gmail.com>"
>> cc: "Ævar Arnfjörð Bjarmason <avarab@gmail.com>"
>>
>>   Documentation/git-branch.txt | 12 ++++++++++++
>>   1 file changed, 12 insertions(+)
>>
>> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
>> index 3bd83a7cbd..7ed91f1be3 100644
>> --- a/Documentation/git-branch.txt
>> +++ b/Documentation/git-branch.txt
>> @@ -314,6 +314,18 @@ $ git branch -D test                                    <2>
>>   <2> Delete the "test" branch even if the "master" branch (or whichever branch
>>       is currently checked out) does not have all commits from the test branch.
>>   
>> +Listing branches from a specific remote::
>> ++
>> +------------
>> +$ git branch -a -l '<remote>/<pattern>'                 <1>
>> +$ git for-each-ref 'refs/remotes/<remote>/<pattern>'    <2>
>> +------------
>> ++
>> +<1> This can conflate <remote> with any local branches you happen to
>> +    have been prefixed with the same <remote> pattern.
>> +<2> `for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]
>> +
>> +Patterns will normally need quoting.
>>   
>>   NOTES
>>   -----


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH] doc branch: provide examples for listing remote tracking branches
  2019-05-28 14:17           ` Philip Oakley
@ 2019-05-28 14:51             ` Philip Oakley
  2019-05-28 15:51               ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-28 14:51 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: GitList, Ævar Arnfjörð Bjarmason

Hi Junio,

On 28/05/2019 15:17, Philip Oakley wrote:
> On 28/05/2019 14:58, Junio C Hamano wrote:
>> Philip Oakley <philipoakley@iee.org> writes:
>>
>>> The availability of these pattern selections is not obvious from
>>> the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.
>>>
>>> Provide examples.
>>>
>>> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>>> ---
>> Please try again, perhaps after reading
>> <CACsJy8B_3ZytR+5HvOax=ngw7ECse8_5ajkOvUEcOj3MuNxQvQ@mail.gmail.com>
> Hi Junio
> Sorry, I'm not understanding the comment, even having re-read the thread.
> Philip
I guess you were referring to you more recent reply to Ævar.

However, isn't `-r <pattern>` broken?

phili@Philip-Win10 MINGW64 /c/git-sdk-64/usr/src/git (branch-patterns)
$ git branch -a -l 'junio/*'
   remotes/junio/maint
   remotes/junio/master
   remotes/junio/next
   remotes/junio/pu
   remotes/junio/todo

phili@Philip-Win10 MINGW64 /c/git-sdk-64/usr/src/git (branch-patterns)
$ git branch -a -r 'junio/*'
fatal: -a and -r options to 'git branch' do not make sense with a branch 
name

phili@Philip-Win10 MINGW64 /c/git-sdk-64/usr/src/git (branch-patterns)
$ git branch -r 'junio/*'
fatal: -a and -r options to 'git branch' do not make sense with a branch 
name

phili@Philip-Win10 MINGW64 /c/git-sdk-64/usr/src/git (branch-patterns)
$ git branch -r
   dscho-git/add-i-fixes
   dscho-git/add-i-in-c-all-except-patch
   dscho-git/add-i-in-c-status-and-help
...


The docs for the branch -r and -a option could do with mentioning that 
they are meant to accept a pattern, as all the other mentions are hidden 
mid paragraph.

I'll prepare a v2 for the docs, but haven't the time at the moment to 
investigate the code fail (missing a test?).

Philip

>>
>> Thanks.
>>
>>> in response to
>>> <CACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S+hiXBoUGQ@mail.gmail.com>
>>> https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E 
>>>
>>>
>>> to: "Git Mailing List <git@vger.kernel.org>"
>>> cc: "Duy Nguyen <pclouds@gmail.com>"
>>> cc: "Ævar Arnfjörð Bjarmason <avarab@gmail.com>"
>>>
>>>   Documentation/git-branch.txt | 12 ++++++++++++
>>>   1 file changed, 12 insertions(+)
>>>
>>> diff --git a/Documentation/git-branch.txt 
>>> b/Documentation/git-branch.txt
>>> index 3bd83a7cbd..7ed91f1be3 100644
>>> --- a/Documentation/git-branch.txt
>>> +++ b/Documentation/git-branch.txt
>>> @@ -314,6 +314,18 @@ $ git branch -D 
>>> test                                    <2>
>>>   <2> Delete the "test" branch even if the "master" branch (or 
>>> whichever branch
>>>       is currently checked out) does not have all commits from the 
>>> test branch.
>>>   +Listing branches from a specific remote::
>>> ++
>>> +------------
>>> +$ git branch -a -l '<remote>/<pattern>'                 <1>
>>> +$ git for-each-ref 'refs/remotes/<remote>/<pattern>'    <2>
>>> +------------
>>> ++
>>> +<1> This can conflate <remote> with any local branches you happen to
>>> +    have been prefixed with the same <remote> pattern.
>>> +<2> `for-each-ref` can take a wide range of options. See 
>>> linkgit:git-for-each-ref[1]
>>> +
>>> +Patterns will normally need quoting.
>>>     NOTES
>>>   -----
>


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH] doc branch: provide examples for listing remote tracking branches
  2019-05-28 14:51             ` Philip Oakley
@ 2019-05-28 15:51               ` Junio C Hamano
  2019-05-28 16:17                 ` Philip Oakley
  0 siblings, 1 reply; 16+ messages in thread
From: Junio C Hamano @ 2019-05-28 15:51 UTC (permalink / raw)
  To: Philip Oakley; +Cc: GitList, Ævar Arnfjörð Bjarmason

Philip Oakley <philipoakley@iee.org> writes:

> However, isn't `-r <pattern>` broken?

No.

> phili@Philip-Win10 MINGW64 /c/git-sdk-64/usr/src/git (branch-patterns)
> $ git branch -a -l 'junio/*'

You are asking "branch --all --list" here.

> $ git branch -a -r 'junio/*'
> fatal: -a and -r options to 'git branch' do not make sense with a
> branch name

You wanted to ask "branch --remote --list" instead of "branch --all
--remote", no?


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH] doc branch: provide examples for listing remote tracking branches
  2019-05-28 15:51               ` Junio C Hamano
@ 2019-05-28 16:17                 ` Philip Oakley
  2019-05-28 23:16                   ` [RFC/PATCH v2] " Philip Oakley
  0 siblings, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-28 16:17 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: GitList, Ævar Arnfjörð Bjarmason

On 28/05/2019 16:51, Junio C Hamano wrote:
> Philip Oakley <philipoakley@iee.org> writes:
>
>> However, isn't `-r <pattern>` broken?
> No.
Then why does it say:
     fatal: -a and -r options to 'git branch' do not make sense with a 
branch name

when there is no `-a` given?
>
>> phili@Philip-Win10 MINGW64 /c/git-sdk-64/usr/src/git (branch-patterns)
>> $ git branch -a -l 'junio/*'
> You are asking "branch --all --list" here.
>
>> $ git branch -a -r 'junio/*'
>> fatal: -a and -r options to 'git branch' do not make sense with a
>> branch name
> You wanted to ask "branch --remote --list" instead of "branch --all
> --remote", no?
>
The initial expectation was that a simple "--remote <pattern>" would be 
all that was required to list the rtbs with the sub-pattern (see fatal 
above, which is maybe how Ævar got his -a formulation). But it now 
appears that we/I need the --list, to allow a pattern, and either -a, or 
-r, to include the rtbs in the list.

So ultimately, yes, to just get the rtbs of a specific remote one needs 
your "branch --remote --list `<remote>/*' "formulation.

Philip

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [RFC/PATCH v2] doc branch: provide examples for listing remote tracking branches
  2019-05-28 16:17                 ` Philip Oakley
@ 2019-05-28 23:16                   ` " Philip Oakley
  2019-06-10 17:57                     ` Junio C Hamano
  0 siblings, 1 reply; 16+ messages in thread
From: Philip Oakley @ 2019-05-28 23:16 UTC (permalink / raw)
  To: GitList
  Cc: Duy Nguyen, Ævar Arnfjörð Bjarmason, Junio C Hamano

The availability of these pattern selections is not obvious from
the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.

Provide examples.

Re-order the `git branch` synopsis to emphasise the `--list <pattern>`
pairing. Also expand and reposition the `all/remotes` options.

Split the over-long description into three parts so that the <pattern>
description can be seen.

Clarify that the `all/remotes` options require the --list if patterns
are to be used.

Add examples of listing remote tracking branches that match a pattern,
including `git for-each-ref` which has more options.

Improve the -a/-r warning message. The message confused this author
as the combined -a and -r options had not been given, though a pattern
had. Specifically guide the user that maybe they needed the --list
option to enable a remote branch pattern selection.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---

in response to 
<2ea35ad4-4b33-0ece-4de4-b2e92a100d9a@iee.org>
thread: https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E

to: Git Mailing List <git@vger.kernel.org>
cc: Duy Nguyen <pclouds@gmail.com>
cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
cc: Junio C Hamano <gitster@pobox.com>


 Documentation/git-branch.txt | 32 ++++++++++++++++++++++++++------
 builtin/branch.c             |  3 ++-
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 3bd83a7cbd..c57f6a15c6 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -8,12 +8,14 @@ git-branch - List, create, or delete branches
 SYNOPSIS
 --------
 [verse]
-'git branch' [--color[=<when>] | --no-color] [-r | -a]
-	[--list] [-v [--abbrev=<length> | --no-abbrev]]
+'git branch' [--color[=<when>] | --no-color]
+	[-v [--abbrev=<length> | --no-abbrev]]
 	[--column[=<options>] | --no-column] [--sort=<key>]
 	[(--merged | --no-merged) [<commit>]]
 	[--contains [<commit]] [--no-contains [<commit>]]
-	[--points-at <object>] [--format=<format>] [<pattern>...]
+	[--points-at <object>] [--format=<format>]
+	[(-r | --remotes) | (-a | --all)]
+	[--list] [<pattern>...]
 'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]
 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 'git branch' --unset-upstream [<branchname>]
@@ -28,11 +30,15 @@ DESCRIPTION
 If `--list` is given, or if there are no non-option arguments, existing
 branches are listed; the current branch will be highlighted with an
 asterisk.  Option `-r` causes the remote-tracking branches to be listed,
-and option `-a` shows both local and remote branches. If a `<pattern>`
+and option `-a` shows both local and remote branches.
+
+If a `<pattern>`
 is given, it is used as a shell wildcard to restrict the output to
 matching branches. If multiple patterns are given, a branch is shown if
-it matches any of the patterns.  Note that when providing a
-`<pattern>`, you must use `--list`; otherwise the command is interpreted
+it matches any of the patterns.
+
+Note that when providing a
+`<pattern>`, you must use `--list`; otherwise the command may be interpreted
 as branch creation.
 
 With `--contains`, shows only the branches that contain the named commit
@@ -149,10 +155,12 @@ This option is only applicable in non-verbose mode.
 -r::
 --remotes::
 	List or delete (if used with -d) the remote-tracking branches.
+	Combine with `--list` to match the optional pattern(s).
 
 -a::
 --all::
 	List both remote-tracking branches and local branches.
+	Combine with `--list` to match optional pattern(s).
 
 -l::
 --list::
@@ -314,6 +322,18 @@ $ git branch -D test                                    <2>
 <2> Delete the "test" branch even if the "master" branch (or whichever branch
     is currently checked out) does not have all commits from the test branch.
 
+Listing branches from a specific remote::
++
+------------
+$ git branch -r -l '<remote>/<pattern>'                 <1>
+$ git for-each-ref 'refs/remotes/<remote>/<pattern>'    <2>
+------------
++
+<1> Using `-a` would conflate <remote> with any local branches you happen to
+    have been prefixed with the same <remote> pattern.
+<2> `for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]
+
+Patterns will normally need quoting.
 
 NOTES
 -----
diff --git a/builtin/branch.c b/builtin/branch.c
index 1be727209b..30906d4526 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -810,7 +810,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		strbuf_release(&buf);
 	} else if (argc > 0 && argc <= 2) {
 		if (filter.kind != FILTER_REFS_BRANCHES)
-			die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
+			die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
+				  "Did you mean to use: -a|-r --list <pattern>?"));
 
 		if (track == BRANCH_TRACK_OVERRIDE)
 			die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
-- 
2.22.0.rc1.windows.1.33.gc7da05f206


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [RFC/PATCH v2] doc branch: provide examples for listing remote tracking branches
  2019-05-28 23:16                   ` [RFC/PATCH v2] " Philip Oakley
@ 2019-06-10 17:57                     ` Junio C Hamano
  2019-06-14 21:00                       ` Philip Oakley
  0 siblings, 1 reply; 16+ messages in thread
From: Junio C Hamano @ 2019-06-10 17:57 UTC (permalink / raw)
  To: Philip Oakley; +Cc: GitList, Duy Nguyen, Ævar Arnfjörð Bjarmason

Philip Oakley <philipoakley@iee.org> writes:

> The availability of these pattern selections is not obvious from
> the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.
>
> Provide examples.
>
> Re-order the `git branch` synopsis to emphasise the `--list <pattern>`
> pairing. Also expand and reposition the `all/remotes` options.
>
> Split the over-long description into three parts so that the <pattern>
> description can be seen.
>
> Clarify that the `all/remotes` options require the --list if patterns
> are to be used.
>
> Add examples of listing remote tracking branches that match a pattern,
> including `git for-each-ref` which has more options.
>
> Improve the -a/-r warning message. The message confused this author
> as the combined -a and -r options had not been given, though a pattern
> had. Specifically guide the user that maybe they needed the --list
> option to enable a remote branch pattern selection.
>
> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---
>
> in response to 
> <2ea35ad4-4b33-0ece-4de4-b2e92a100d9a@iee.org>
> thread: https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E
>
> to: Git Mailing List <git@vger.kernel.org>
> cc: Duy Nguyen <pclouds@gmail.com>
> cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> cc: Junio C Hamano <gitster@pobox.com>

This looks reasonable to me---is it ready to go even with its RFC prefix?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [RFC/PATCH v2] doc branch: provide examples for listing remote tracking branches
  2019-06-10 17:57                     ` Junio C Hamano
@ 2019-06-14 21:00                       ` Philip Oakley
  0 siblings, 0 replies; 16+ messages in thread
From: Philip Oakley @ 2019-06-14 21:00 UTC (permalink / raw)
  To: Junio C Hamano, Philip Oakley
  Cc: GitList, Duy Nguyen, Ævar Arnfjörð Bjarmason

Hi Junio,

On 10/06/2019 18:57, Junio C Hamano wrote:
> Philip Oakley <philipoakley@iee.org> writes:
>
>> The availability of these pattern selections is not obvious from
>> the man pages, as per mail thread <87lfz3vcbt.fsf@evledraar.gmail.com>.
>>
>> Provide examples.
>>
>> Re-order the `git branch` synopsis to emphasise the `--list <pattern>`
>> pairing. Also expand and reposition the `all/remotes` options.
>>
>> Split the over-long description into three parts so that the <pattern>
>> description can be seen.
>>
>> Clarify that the `all/remotes` options require the --list if patterns
>> are to be used.
>>
>> Add examples of listing remote tracking branches that match a pattern,
>> including `git for-each-ref` which has more options.
>>
>> Improve the -a/-r warning message. The message confused this author
>> as the combined -a and -r options had not been given, though a pattern
>> had. Specifically guide the user that maybe they needed the --list
>> option to enable a remote branch pattern selection.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>> ---
>>
>> in response to
>> <2ea35ad4-4b33-0ece-4de4-b2e92a100d9a@iee.org>
>> thread: https://public-inbox.org/git/?q=%3CCACsJy8CwY8gzeWa9kNRX3ecez1JGiQiaOknbAoU7S%2BhiXBoUGQ%40mail.gmail.com%3E
>>
>> to: Git Mailing List <git@vger.kernel.org>
>> cc: Duy Nguyen <pclouds@gmail.com>
>> cc: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> cc: Junio C Hamano <gitster@pobox.com>
> This looks reasonable to me---is it ready to go even with its RFC prefix?

Yes; the RFC was only in regard of the die() message change as it 
touches real code;-)


Following the post, Stolee's coverage report, it was noted that the 
die() wasn't actually tested, so I sent a quick follow-up of a potential 
test 
https://public-inbox.org/git/f28dd5b1-fda8-cf51-5582-067a7d2c2472@iee.org/ 
which is a proper RFC...


I did not attempt to see if any other dies()'s were untested, just 
copied one that was..

Philip

(currently travelling)


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, back to index

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-18 15:16 Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's) Philip Oakley
2019-05-18 18:37 ` Ævar Arnfjörð Bjarmason
2019-05-18 19:44   ` Philip Oakley
2019-05-19  3:07     ` Duy Nguyen
2019-05-19  9:49       ` Philip Oakley
2019-05-28 12:13       ` [PATCH] doc branch: provide examples for listing remote tracking branches Philip Oakley
2019-05-28 13:58         ` Junio C Hamano
2019-05-28 14:17           ` Philip Oakley
2019-05-28 14:51             ` Philip Oakley
2019-05-28 15:51               ` Junio C Hamano
2019-05-28 16:17                 ` Philip Oakley
2019-05-28 23:16                   ` [RFC/PATCH v2] " Philip Oakley
2019-06-10 17:57                     ` Junio C Hamano
2019-06-14 21:00                       ` Philip Oakley
2019-05-19  3:05   ` Command to list <pattern> Branches on a specific Remote (i.e. select from rtb's) Duy Nguyen
2019-05-28 13:57   ` Junio C Hamano

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox