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

Re: git merging

From
Linus Torvalds <torvalds@osdl.org>
Date
Jun 20, 2005, 21:15 UTC
Message-ID
<Pine.LNX.4.58.0506201410050.2268@ppc970.osdl.org>
In-Reply-To
<20050620203821.GC7712@suse.de>
On Mon, 20 Jun 2005, Jens Axboe wrote:
Show 5 quoted lines
> 
> I pulled with rsync manually from kernel.org, and that did fix things up
> for me. The main tree is rsync'ed, but the development tree gets the
> changes with /opt/kernel/git/linux-2.6/.git/ as the url given to
> git-pull-script.

Ok, that explains it. Since you're using a regular local filename, the pull will be using "git-local-pull", which will only fetch the objects directly needed. And doesn't understand the tag-to-tree thing, so doesn't fetch the tree (or possibly you just copied the tags by hand totally outside of the regular pull?)

		Linus
Previous: Jens AxboeNext: Jens Axboe
Message 14 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.