{"thread":{"id":"3832","subject":"strange behavior when pulling updates / get uptodate with git.git","startedAt":"2006-04-08T19:57:00Z","lastAt":"2006-04-08T21:19:10Z","messageCount":3,"participants":["Nicolas Vilz 'niv'","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18474","messageId":"4438158C.1080208@iaglans.de","threadId":"3832","inReplyTo":null,"subject":"strange behavior when pulling updates / get uptodate with git.git","fromName":"Nicolas Vilz 'niv'","fromEmail":"niv@iaglans.de","sentAt":"2006-04-08T19:57:00Z","receivedAt":"2006-04-08T19:57:00Z","isPatch":false,"sender":{"key":"niv@iaglans.de","avatar":"https://gravatar.com/avatar/e4d43a32d721241212d4edb1d2210327e28423c913071b4bfeeaa0ce15296110?d=mp&s=160"},"body":"Hello guys,\n\nI experience a loss of tags- and branch-updates, when I try to update my\nrepository.\n\nI normaly do following\n\ngit checkout master\ngit pull origin\n\nmy .git/remotes/origin-file looks like this:\n\nURL: git://git.kernel.org/pub/scm/git/git.git\nPull: refs/heads/master:refs/heads/origin\nPull: refs/heads/todo:refs/heads/todo\nPull: refs/heads/maint:refs/heads/maint\nPull: refs/heads/pu:refs/heads/pu\nPull: refs/heads/man:refs/heads/man\nPull: refs/heads/next:refs/heads/next\nPull: refs/heads/html:refs/heads/html\n\nso i suppose, if i try to pull origin, and i am in master, i should be\nable to pull these remote heads each in the correct local head...\n\nBut I obviously don't.\n\nafter deleting the actual git-repository directory and recloning with\n\ngit clone <url>\n\nI have obviously more tags than git was trying to merge before at git\npull origin..\n\nI use git version 1.3.0.rc1.g4c0f (located in the next-tree).\n\nAny hints how this could be better on my system?\n\nSincerly\nNicolas\n"},{"id":"18480","messageId":"7vmzeveqin.fsf@assigned-by-dhcp.cox.net","threadId":"3832","inReplyTo":"4438158C.1080208@iaglans.de","subject":"Re: strange behavior when pulling updates / get uptodate with git.git","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-08T20:55:28Z","receivedAt":"2006-04-08T20:55:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nicolas Vilz 'niv' <niv@iaglans.de> writes:\n\n> URL: git://git.kernel.org/pub/scm/git/git.git\n> Pull: refs/heads/master:refs/heads/origin\n> Pull: refs/heads/todo:refs/heads/todo\n> Pull: refs/heads/maint:refs/heads/maint\n> Pull: refs/heads/pu:refs/heads/pu\n> Pull: refs/heads/man:refs/heads/man\n> Pull: refs/heads/next:refs/heads/next\n> Pull: refs/heads/html:refs/heads/html\n>\n> so i suppose, if i try to pull origin, and i am in master, i should be\n> able to pull these remote heads each in the correct local head...\n>\n> But I obviously don't.\n\nMost likely it is aborted by the \"pu\" branch not\nfast-forwarding.\n\n\tPull: +refs/heads/pu:refs/heads/pu\n\nor dropping \"pu\" altogether if you are not interested in it,\nwould help.  My repositories (the ones I fetch/pull from for\ntesting) have only these:\n\n        URL: git://git.kernel.org/pub/scm/git/git.git\n        Pull: refs/heads/master:refs/heads/origin\n        Pull: refs/heads/next:refs/heads/next\n        Pull: +refs/heads/pu:refs/heads/pu\n        Pull: refs/heads/maint:refs/heads/maint\n"},{"id":"18483","messageId":"443828CE.4070707@iaglans.de","threadId":"3832","inReplyTo":"7vmzeveqin.fsf@assigned-by-dhcp.cox.net","subject":"Re: strange behavior when pulling updates / get uptodate with git.git","fromName":"Nicolas Vilz 'niv'","fromEmail":"niv@iaglans.de","sentAt":"2006-04-08T21:19:10Z","receivedAt":"2006-04-08T21:19:10Z","isPatch":false,"sender":{"key":"niv@iaglans.de","avatar":"https://gravatar.com/avatar/e4d43a32d721241212d4edb1d2210327e28423c913071b4bfeeaa0ce15296110?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Most likely it is aborted by the \"pu\" branch not\n> fast-forwarding.\n> \n> \tPull: +refs/heads/pu:refs/heads/pu\n> \n> or dropping \"pu\" altogether if you are not interested in it,\n> would help.  \n\nThank you, the +-sign helped me out.\n\nSincerly\nNicolas\n"}]}