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

Re: git merging

From
JGJeff Garzik <jgarzik@pobox.com>
Date
Jun 17, 2005, 23:08 UTC
Message-ID
<42B357D7.6030302@pobox.com>
In-Reply-To
<Pine.LNX.4.58.0506171142500.2268@ppc970.osdl.org>
Linus Torvalds wrote:
> The "git prune" script is really trivial, you can see for yourself what 
> "git-prune-script" does.
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. Luckily, the objects it ate were all in the main branch, so an rsync-without-delete from linux-2.6.git/objects would restore the missing data.

This was verified by repeated runs of
	git-fsck-cache		# OK
	git-prune-script
	git-fsck-cache		# spits out tons of errors
	rsync ...		# restore deleted objects
	git-fsck-cache		# OK

I use hardlinks on the local disk, between several multi-branch repos, if that matters.

	Jeff
Previous: Jens AxboeNext: Linus Torvalds
Message 3 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.