git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] branch: add show-tracking option

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
May 16, 2013, 08:23 UTC
Message-ID
<51949768.5020305@drmicha.warpmail.net>
In-Reply-To
<CAMP44s3s_Tg=FX8emOC1Gs_LqPU-i-mWNswoOT82MkNBUUsjUA@mail.gmail.com>
Felipe Contreras venit, vidit, dixit 16.05.2013 10:09:
Show 28 quoted lines
> On Thu, May 16, 2013 at 3:00 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Felipe Contreras venit, vidit, dixit 16.05.2013 09:48:
>>> Showing the tracking information for all the branches takes significant
>>> amount of time. The user might not want that. The --no-show-tracking
>>> option allows that.
>>
>> I really like the idea of allowing that - not just because I've
>> suggested so myself in the past ;)
>>
>> I feel, though, that we're really exploding our option and config realm.
>> For "git branch" in list mode, we are already able to stack "-v", i.e.
>> "-v" and "-vv" do different things. How about maybe adding "-vvv" and
>> arranging things so that the verbosity and the run time increases with
>> the number of v's?
>>
>> -v list with sha1 + subject of last commit
>> -vv add upstream branch name
>> -vvv add ahead/behind info (the only costly mode)
>> -vvvv same with "--cherry" (ahead/behind/same)
> 
> Yeah, I thought about that too.
> 
>> Or maybe combine the middle two cases into "-vv", which means it would
>> be the same as "-vv", with only "-v" changing what it does now.
> 
> Please no, I would like to see 'upstream', but not ahead/behind info.
> In fact, that's my whole motivation behind this patch.
I'd be fine with combining the first two also.
Show 24 quoted lines
>> Yes, this changes current behavior (at least fpr -v), which sucks
>> anyways because of the costly lookup. And those scripting around "branch
>> -v" should get what they deserve. (I may sound annoyed by our
>> compatibility brakes, but here's a case where breaking it should be OK.)
> 
> I also agree that it would be OK to break this.
> 
> Alternatively, I've been thinking that we should have a v2.0 mode, or
> a v2.0 branch, where all the compatibility breakage things go. We have
> been so careful at not breaking things, that we have been too good at
> stacking hacks and configurations all over the place, and in my
> experience it's not unusual that right after an incompatibility
> release, someone realizes that we forgot some compat breakage things,
> and oh, well, maybe for v3.0.
> 
> The ones I have in mind are:
> 
> color.ui=true
> merge.defaulttoupstream=true
> format.coverletter=auto
> branch.autosetupmerge=always
> mergetool.prompt=false
> 
> Cheers.

Yes. Additionally, there are things which we can break during normal releases, but somehow the compatibility discussions have kept us from doing so. Maybe we need a clearer separation of porcellain and plumbing again? Or a clearer definition of x, y, z in x.y.z releases? We haven't even used y increases for incompatible ui changes that much.

Michael
Previous: Felipe ContrerasNext: Duy Nguyen
Message 7 of 14 in “branch: add show-tracking option”
  1. branch: add show-tracking optionFelipe Contreras, May 16, 2013
  2. Felipe ContrerasMay 16, 2013
  3. Duy NguyenMay 16, 2013
  4. Felipe ContrerasMay 16, 2013
  5. Michael J GruberMay 16, 2013
  6. Felipe ContrerasMay 16, 2013
  7. Michael J GruberMay 16, 2013
  8. Duy NguyenMay 16, 2013
  9. Michael J GruberMay 16, 2013
  10. Duy NguyenMay 16, 2013
  11. Junio C HamanoMay 16, 2013
  12. Felipe ContrerasMay 16, 2013
  13. Junio C HamanoMay 16, 2013
  14. Junio C HamanoMay 16, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.