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

Re: [PATCH v2 06/20] checkout: check_linked_checkout: improve "already checked out" aesthetic

From
Duy Nguyen <pclouds@gmail.com>
Date
Jul 17, 2015, 01:42 UTC
Message-ID
<CACsJy8AGp7Y+nJjVvp2sgfTvPuKE2ODdfa3wsJ9YhPk57YOtCg@mail.gmail.com>
In-Reply-To
<CAPig+cRtCon=jaqbjZyHTvJ3cydiyAz+5OC=3x30VfAJniYYMQ@mail.gmail.com>
On Fri, Jul 17, 2015 at 7:32 AM, Eric Sunshine <sunshine@sunshineco.com> wrote:
Show 20 quoted lines
>> In the new world order with GIT_DIR and GIT_COMMON_DIR, does
>> "$GIT_DIR" always have to be the same as "$GIT_WORK_TREE/.git"?  Do
>> we need some sanity check if that is the case?  Perhaps: if you have
>> $GIT_DIR set to $somewhere/.git/worktrees/$name, then
>>
>>  - $GIT_COMMON_DIR must match $somewhere/.git,
>>
>>  - $somewhere/.git/worktrees/$name/commondir must point at
>>    $GIT_COMMON_DIR,
>>
>>  - $GIT_WORK_TREE/.git must match $GIT_DIR
>>
>> or something like that?
>
> Duy is probably better suited to answer this, as he would likely have
> taken these issues into consideration when implementing the feature.
> (I've been poking through documentation and code for quite a while
> trying to answer this email but don't yet have a sufficient grasp to
> do it justice. I'm not even sure where such a sanity check would be
> placed.)

The thing is, we just don't know where the worktree is. All we know is somewhere there is a .git file sharing this repository. People can create a linked worktree, then move the actual linked worktree away, set GIT_DIR/GIT_WORK_TREE to reflect that, and everything must still work. So, we could say "foo is already checked out at the worktree that is linked to /some/path/.git" to be technically correct. But that's not so friendly? We could cache the $GIT_WORK_TREE, when the user accesses the linked checkout, somewhere in .git/worktrees/foo and show it instead of /some/path/.git. But that's not always accurate.

-- 
Duy
Previous: Eric SunshineNext: Eric Sunshine
Message 10 of 25 in “rid git-checkout of too-intimate knowledge of new worktree”
  1. 00/20 rid git-checkout of too-intimate knowledge of new worktreeEric Sunshine, Jul 16, 2015
  2. 01/20 checkout: avoid resolving HEAD unnecessarilyEric Sunshine, Jul 16, 2015
  3. 02/20 checkout: name check_linked_checkouts() more meaningfullyEric Sunshine, Jul 16, 2015
  4. 03/20 checkout: improve die_if_checked_out() robustnessEric Sunshine, Jul 16, 2015
  5. 04/20 checkout: die_if_checked_out: simplify strbuf managementEric Sunshine, Jul 16, 2015
  6. 05/20 checkout: generalize die_if_checked_out() branch name argumentEric Sunshine, Jul 16, 2015
  7. 06/20 checkout: check_linked_checkout: improve "already checked out" aestheticEric Sunshine, Jul 16, 2015
  8. Junio C HamanoJul 16, 2015
  9. Eric SunshineJul 17, 2015
  10. Duy NguyenJul 17, 2015
  11. 07/20 checkout: check_linked_checkout: simplify symref parsingEric Sunshine, Jul 16, 2015
  12. 08/20 checkout: teach check_linked_checkout() about symbolic link HEADEric Sunshine, Jul 16, 2015
  13. 09/20 branch: publish die_if_checked_out()Eric Sunshine, Jul 16, 2015
  14. 10/20 worktree: simplify new branch (-b/-B) option checkingEric Sunshine, Jul 16, 2015
  15. 11/20 worktree: introduce options containerEric Sunshine, Jul 16, 2015
  16. 12/20 worktree: make --detach mutually exclusive with -b/-BEric Sunshine, Jul 16, 2015
  17. 13/20 worktree: make branch creation distinct from worktree populationEric Sunshine, Jul 16, 2015
  18. 14/20 worktree: elucidate environment variables intended for child processesEric Sunshine, Jul 16, 2015
  19. 15/20 worktree: add_worktree: construct worktree-population command locallyEric Sunshine, Jul 16, 2015
  20. 16/20 worktree: detect branch-name/detached and error conditions locallyEric Sunshine, Jul 16, 2015
  21. 17/20 worktree: make setup of new HEAD distinct from worktree populationEric Sunshine, Jul 16, 2015
  22. 18/20 worktree: avoid resolving HEAD unnecessarilyEric Sunshine, Jul 16, 2015
  23. 19/20 worktree: populate via "git reset --hard" rather than "git checkout"Eric Sunshine, Jul 16, 2015
  24. 20/20 checkout: drop intimate knowledge of newly created worktreeEric Sunshine, Jul 16, 2015
  25. Junio C HamanoJul 16, 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.