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

Re: Bug? git worktree fails with master on bare repo

From
Kevin Daudt <me@ikke.info>
Date
Oct 9, 2016, 06:50 UTC
Message-ID
<20161009065046.GD25613@ikke.info>
In-Reply-To
<CAOi_75+2SG2WYHBMQhfGj96eKsZ66niJzOevVGM5eJv-qqrVNg@mail.gmail.com>
On Sat, Oct 08, 2016 at 07:30:36PM -0500, Michael Tutty wrote:
Show 17 quoted lines
> Hey all,
> I'm working on some server-side software to do a merge. By using git
> worktree it's possible to check out a given branch for a bare repo and
> merge another branch into it. It's very fast, even with large
> repositories.
> 
> The only exception seems to be merging to master. When I do git
> worktree add /tmp/path/to/worktree master I get an error:
> 
> [fatal: 'master' is already checked out at '/path/to/bare/repo']
> 
> But this is clearly not true, git worktree list gives:
> 
> [/path/to/bare/repo (bare)]
> 
> ...and of course, there is no work tree at that path, just the bare
> repo files you'd expect.

A bare repo still has a HEAD, which by default points to refs/heads/master. That's what's it complaining about.

So the question is, should there be an exception for the branch 'checked out' on a bare reposity.

Previous: Michael TuttyNext: Dennis Kaarsemaker
Message 2 of 14 in “Bug? git worktree fails with master on bare repo”
  1. Michael TuttyOct 9, 2016
  2. Kevin DaudtOct 9, 2016
  3. Dennis KaarsemakerOct 9, 2016
  4. Duy NguyenOct 9, 2016
  5. Michael TuttyOct 9, 2016
  6. Duy NguyenOct 10, 2016
  7. Michael TuttyOct 10, 2016
  8. Kevin DaudtOct 11, 2016
  9. worktree: allow the main brach of a bare repository to be checked outDennis Kaarsemaker, Oct 12, 2016
  10. Michael TuttyOct 12, 2016
  11. Junio C HamanoOct 12, 2016
  12. Junio C HamanoOct 12, 2016
  13. Duy NguyenOct 13, 2016
  14. Dennis KaarsemakerOct 12, 2016

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.