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

Re: [PATCH v7 2/8] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

From
David Turner <dturner@twopensource.com>
Date
Jul 15, 2015, 18:04 UTC
Message-ID
<1436983476.7540.4.camel@twopensource.com>
In-Reply-To
<xmqqd1ztxubj.fsf@gitster.dls.corp.google.com>
On Wed, 2015-07-15 at 09:24 -0700, Junio C Hamano wrote:
Show 11 quoted lines
> > On reflection, I think that this would also be a reasonable approach to
> > take for stash, which does not fall into any of the listed categories.
> > It's not a pseudoref because it's not all-caps and it starts with refs/.
> > Unlike other pseudorefs, it needs a reflog.  But like HEAD and unlike
> > other refs, it (and its reflog) wants to be per-worktree.
> 
> I think we want stash, unlike HEAD, to be shared across worktrees,
> and contrib/workdir gets this right.
> 
> So there is nothing that makes refs/stash like CHERRY_PICK_HEAD at
> all.

I just did a brief survey here and folks here agree with you. So, I'll adjust my patches accordingly.

Show 10 quoted lines
> > Are there
> > other ref-like-things in this category (which I'll call "per-worktree
> > refs")?  I guess one set of these is submodules' HEADs.
> 
> I've been assuming that a secondary worktree of superproject will
> get its own & corresponding secondary worktree of a submodule, which
> would automatically give per-worktree "submodule's HEADs" and
> everything else that has to be per-worktree.  Am I missing something
> or are there any more need for underlying machinery than what we
> currently have for secondary worktrees for a single project tree?

That sounds good to me, but judging by the docs, that's not yet implemented. So I'm going to worry about that when it is implemented.

Previous: Junio C HamanoNext: David Turner
Message 15 of 30 in “refs.c: add err arguments to reflog functions”
  1. 1/8 refs.c: add err arguments to reflog functionsDavid Turner, Jul 8, 2015
  2. 2/8 cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refsDavid Turner, Jul 8, 2015
  3. Johannes SixtJul 8, 2015
  4. David TurnerJul 8, 2015
  5. Johannes SixtJul 8, 2015
  6. Junio C HamanoJul 8, 2015
  7. David TurnerJul 8, 2015
  8. Junio C HamanoJul 9, 2015
  9. David TurnerJul 9, 2015
  10. Junio C HamanoJul 9, 2015
  11. Michael HaggertyJul 10, 2015
  12. David TurnerJul 10, 2015
  13. David TurnerJul 14, 2015
  14. Junio C HamanoJul 15, 2015
  15. David TurnerJul 15, 2015
  16. David TurnerJul 8, 2015
  17. 3/8 bisect: treat BISECT_HEAD as a refDavid Turner, Jul 8, 2015
  18. 4/8 refs: Break out check for reflog autocreationDavid Turner, Jul 8, 2015
  19. 5/8 refs: new public ref function: safe_create_reflogDavid Turner, Jul 8, 2015
  20. Michael HaggertyJul 8, 2015
  21. 6/8 git-reflog: add exists commandDavid Turner, Jul 8, 2015
  22. 7/8 update-ref and tag: add --create-reflog argDavid Turner, Jul 8, 2015
  23. Michael HaggertyJul 8, 2015
  24. David TurnerJul 8, 2015
  25. 8/8 git-stash: use update-ref --create-reflog instead of creating filesDavid Turner, Jul 8, 2015
  26. Junio C HamanoJul 8, 2015
  27. Junio C HamanoJul 8, 2015
  28. Michael HaggertyJul 8, 2015
  29. Michael HaggertyJul 8, 2015
  30. David TurnerJul 8, 2015

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.