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

Re: git branch --edit-description a custom file

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Nov 1, 2019, 12:29 UTC
Message-ID
<822d51af-d522-bf2c-72de-f54a4ccb3b38@gmail.com>
In-Reply-To
<20191031200739.GA19313@sigill.intra.peff.net>
Hi Peff
On 31/10/2019 20:07, Jeff King wrote:
Show 13 quoted lines
> On Thu, Oct 31, 2019 at 07:53:18PM +0000, Phillip Wood wrote:
> [...]
>>
>> I'd love to see a consensus around putting remote versions of refs/foo under
>> refs/remote/<remote-name>/foo. To share notes I add a refspec that fetches
>> to refs/remote/<remote-name>/notes. It is a pain that 'git pull' wont merge
>> them for me though.
> 
> The trouble with that sort of scheme is that it conflicts with the
> current namespace scheme, which puts the remote "notes" branch in
> "refs/remotes/<remote-name>/notes". And it's not just a problem if you
> want to have a branch called "notes". Think about what "git fetch
> --prune" would do.

I was suggesting a convention of using refs/remote/ not refs/remotes/ for tracking remote refs that are not branches to avoid that problem. It's not ideal to have remote branches under a different namespace to all the other remote refs but it does avoid breaking current setups. I haven't thought it through but perhaps in the long run we could migrate remote branches to refs/remote/<remote-name>/heads/ and treat refs/remotes/<remote-name>/ as an alias for refs/remote/<remote-name>/heads/. As you say below we'd need to think about how to use remote tags as well.

Show 17 quoted lines
> I do think the world would be a better place if we mapped (all or a
> subset of) the remote "refs/" into "refs/remotes/<remote-name>/". I.e.,
> really creating "refs/remotes/origin/heads" and even
> "refs/remotes/origin/tags". But we'd need to re-adjust the way that some
> ref lookups work (e.g., looking in refs/remotes/*/tags for tags).
> 
> There was some work by Johan Herland around the v1.8 time-frame, but it
> stalled:
> 
>    https://public-inbox.org/git/AANLkTi=yFwOAQMHhvLsB1_xmYOE9HHP2YB4H4TQzwwc8@mail.gmail.com/
> 
> And here's some later discussion:
> 
>    https://public-inbox.org/git/CA+P7+xpj+8DZ=K0pna299Mu3nsQ4+JV_JUK=WFzzAFnJN+Bkbg@mail.gmail.com/
> 
> So in short, I agree very much with the direction you're discussing, but
> I think there's some fundamental work that needs done first.
Thanks for the links, I'll have a read through them.
Best Wishes
Phillip
> -Peff
>
Previous: Jeff KingNext: Jeff King
Message 16 of 21 in “git branch --edit-description a custom file”
  1. Denton LiuOct 30, 2019
  2. Jeff KingOct 30, 2019
  3. Denton LiuOct 30, 2019
  4. Jeff KingOct 31, 2019
  5. Johannes SchindelinOct 31, 2019
  6. Phillip WoodOct 31, 2019
  7. Johannes SchindelinOct 31, 2019
  8. Philip OakleyOct 31, 2019
  9. Jeff KingOct 31, 2019
  10. Philip OakleyNov 3, 2019
  11. Jeff KingNov 4, 2019
  12. Junio C HamanoNov 4, 2019
  13. Denton LiuOct 31, 2019
  14. Phillip WoodOct 31, 2019
  15. Jeff KingOct 31, 2019
  16. Phillip WoodNov 1, 2019
  17. Jeff KingNov 1, 2019
  18. Phillip WoodNov 1, 2019
  19. Junio C HamanoNov 2, 2019
  20. Denton LiuOct 31, 2019
  21. Jeff KingOct 31, 2019

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.