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

Re: git merging

From
Linus Torvalds <torvalds@osdl.org>
Date
Jun 17, 2005, 23:31 UTC
Message-ID
<Pine.LNX.4.58.0506171629320.2268@ppc970.osdl.org>
In-Reply-To
<42B357D7.6030302@pobox.com>
On Fri, 17 Jun 2005, Jeff Garzik wrote:
Show 5 quoted lines
> 
> I've been too lazy to report this, but...
> 
> last time I tried it, git-prune-script ate valid objects, for my 
> multi-branch trees.  This was 100% reproducible.

Ok. The most likely reason is that your main branch is not a symlink to ".git/refs/***" at all, but just a regular ".git/HEAD" file.

"git prune" will by default _only_ look for references in .git/refs/, and if you have any references anywhere else, you need to do all your refs by hand.

There might be a bug in the ref-lookup code, of course, but it's more likely that your refs just aren't where fsck expects them.

		Linus
Previous: Jeff GarzikNext: Jeff Garzik
Message 4 of 16 in “Re: git merging”
  1. Linus TorvaldsJun 17, 2005
  2. Jens AxboeJun 17, 2005
  3. Jeff GarzikJun 17, 2005
  4. Linus TorvaldsJun 17, 2005
  5. Jeff GarzikJun 17, 2005
  6. Linus TorvaldsJun 18, 2005
  7. Jens AxboeJun 20, 2005
  8. Matthias UrlichsJun 20, 2005
  9. Jens AxboeJun 20, 2005
  10. Linus TorvaldsJun 20, 2005
  11. Daniel BarkalowJun 20, 2005
  12. Matthias UrlichsJun 20, 2005
  13. Jens AxboeJun 20, 2005
  14. Linus TorvaldsJun 20, 2005
  15. Jens AxboeJun 21, 2005
  16. Linus TorvaldsJun 21, 2005

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.