{"thread":{"id":"21542","subject":"pulling git -- version confusion","startedAt":"2009-11-09T06:14:24Z","lastAt":"2009-11-09T21:58:46Z","messageCount":7,"participants":["Rustom Mody","Sverre Rabbelier","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"127117","messageId":"f46c52560911082214x81ae8beya139a8bcb3cbcf2a@mail.gmail.com","threadId":"21542","inReplyTo":null,"subject":"pulling git -- version confusion","fromName":"Rustom Mody","fromEmail":"rustompmody@gmail.com","sentAt":"2009-11-09T06:14:24Z","receivedAt":"2009-11-09T06:14:24Z","isPatch":false,"sender":{"key":"rustompmody@gmail.com","avatar":null},"body":"I did a git pull today\n\nWhen I compile it\ngit --version gives\ngit version 1.6.3.3.334.g916e1\n\nWhereas latest stable shown on http://git-scm.com/\nis 1.6.5.2.\n\n\nNote:\n\ngit branch shows a star before master\n\ngit tag contains v1.6.5.2 as well as v1.6.3.3\n\nWhen I checkout branch next\ngit version becomes 1.6.0.rc1.194.g9e4e\n\nCan someone explain whats happening or am I missing something basic?\n"},{"id":"127120","messageId":"fabb9a1e0911082237x462b1203v724b51e309a2d89@mail.gmail.com","threadId":"21542","inReplyTo":"f46c52560911082214x81ae8beya139a8bcb3cbcf2a@mail.gmail.com","subject":"Re: pulling git -- version confusion","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-11-09T06:37:15Z","receivedAt":"2009-11-09T06:37:15Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Nov 9, 2009 at 07:14, Rustom Mody wrote:\n> When I checkout branch next\n> git version becomes  1.6.0.rc1.194.g9e4e\n\nTry either:\n$ git checkout master\n$ git reset --hard origin/master\n\nor:\n$ git checkout next\n$ git reset --hard origin/next\n\nFollowed by:\n$ make\n$ ./git --version\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"127126","messageId":"f46c52560911082345y71eb12c9w114b799d70720dc6@mail.gmail.com","threadId":"21542","inReplyTo":"fabb9a1e0911082237x462b1203v724b51e309a2d89@mail.gmail.com","subject":"Re: pulling git -- version confusion","fromName":"Rustom Mody","fromEmail":"rustompmody@gmail.com","sentAt":"2009-11-09T07:45:23Z","receivedAt":"2009-11-09T07:45:23Z","isPatch":false,"sender":{"key":"rustompmody@gmail.com","avatar":null},"body":"On Mon, Nov 9, 2009 at 12:07 PM, Sverre Rabbelier wrote:\n> Heya,\n>\n> On Mon, Nov 9, 2009 at 07:14, Rustom Mody wrote:\n>> When I checkout branch next\n>> git version becomes  1.6.0.rc1.194.g9e4e\n>\n> Try either:\n> $ git checkout master\n> $ git reset --hard origin/master\n\nGives me\nfatal: ambiguous argument 'origin/master': unknown revision or path\nnot in the working tree.\nUse '--' to separate paths from revisions\n\n>\n> or:\n> $ git checkout next\n> $ git reset --hard origin/next\n\nLikewise here\n>\n> Followed by:\n> $ make\n> $ ./git --version\n>\n> --\n> Cheers,\n>\n> Sverre Rabbelier\n>\n"},{"id":"127125","messageId":"fabb9a1e0911082351o326b205aic205552faae4e4da@mail.gmail.com","threadId":"21542","inReplyTo":"f46c52560911082345y71eb12c9w114b799d70720dc6@mail.gmail.com","subject":"Re: pulling git -- version confusion","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-11-09T07:51:34Z","receivedAt":"2009-11-09T07:51:34Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Nov 9, 2009 at 08:45, Rustom Mody wrote:\n> Gives me\n> fatal: ambiguous argument 'origin/master': unknown revision or path\n> not in the working tree.\n> Use '--' to separate paths from revisions\n\nWell, as what remote do you have upstream configured?\n\nWhat is the output of\n$ git config -l\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"127137","messageId":"f46c52560911090524l51140858sdde29d76e2cfed49@mail.gmail.com","threadId":"21542","inReplyTo":"fabb9a1e0911082351o326b205aic205552faae4e4da@mail.gmail.com","subject":"Re: pulling git -- version confusion","fromName":"Rustom Mody","fromEmail":"rustompmody@gmail.com","sentAt":"2009-11-09T13:24:52Z","receivedAt":"2009-11-09T13:24:52Z","isPatch":false,"sender":{"key":"rustompmody@gmail.com","avatar":null},"body":"On Mon, Nov 9, 2009 at 1:21 PM, Sverre Rabbelier wrote:\n> On Mon, Nov 9, 2009 at 08:45, Rustom Mody wrote:\n>> Gives me\n>> fatal: ambiguous argument 'origin/master': unknown revision or path\n>> not in the working tree.\n>> Use '--' to separate paths from revisions\n>\n> Well, as what remote do you have upstream configured?\n>\n> What is the output of\n> $ git config -l\n\ngives me\n\ncore.safecrlf=true\nuser.email=\nuser.name=\ncore.repositoryformatversion=0\ncore.filemode=true\ngui.geometry=885x450+0+27 207 192\n\nSo theres no remote?\nBut .git/remotes/origin has\n\nURL: git://git.kernel.org/pub/scm/git/git.git\nPull: refs/heads/master:refs/heads/origin\nPull: refs/heads/maint:refs/heads/maint\nPull: refs/heads/next:refs/heads/next\nPull: refs/heads/html:refs/heads/html\nPull: refs/heads/pu:refs/heads/pu\nPull: refs/heads/todo:refs/heads/todo\nPull: refs/heads/man:refs/heads/man\n\nAlso [I just tried this] if I make a fresh repo directly and then do a git pull\nit gives a fatal: where do you want to fetch from\n\nBut with the git repo pull (seems to be) pulling all sorts of stuff\nand not erroring out.\n"},{"id":"127186","messageId":"fabb9a1e0911091116p4c869cefx79cb1354ed464507@mail.gmail.com","threadId":"21542","inReplyTo":"f46c52560911090524l51140858sdde29d76e2cfed49@mail.gmail.com","subject":"Re: pulling git -- version confusion","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-11-09T19:16:21Z","receivedAt":"2009-11-09T19:16:21Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Mon, Nov 9, 2009 at 14:24, Rustom Mody wrote:\n> So theres no remote?\n> But .git/remotes/origin has\n\nIck, how about switching to:\n$ git remote add origin\"git://git.kernel.org/pub/scm/git/git.git\"\n\nAnd then you can do what I said earlier?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"127201","messageId":"7vzl6vqs15.fsf@alter.siamese.dyndns.org","threadId":"21542","inReplyTo":"f46c52560911090524l51140858sdde29d76e2cfed49@mail.gmail.com","subject":"Re: pulling git -- version confusion","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-11-09T21:58:46Z","receivedAt":"2009-11-09T21:58:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Rustom Mody writes:\n\n> On Mon, Nov 9, 2009 at 1:21 PM, Sverre Rabbelier wrote:\n>> On Mon, Nov 9, 2009 at 08:45, Rustom Mody wrote:\n>>> Gives me\n>>> fatal: ambiguous argument 'origin/master': unknown revision or path\n>>> not in the working tree.\n>>> Use '--' to separate paths from revisions\n>>\n>> Well, as what remote do you have upstream configured?\n>>\n>> What is the output of\n>> $ git config -l\n>\n> gives me\n>\n> core.safecrlf=true\n> user.email=\n> user.name=\n> core.repositoryformatversion=0\n> core.filemode=true\n> gui.geometry=885x450+0+27 207 192\n>\n> So theres no remote?\n> But .git/remotes/origin has\n>\n> URL: git://git.kernel.org/pub/scm/git/git.git\n> Pull: refs/heads/master:refs/heads/origin\n> Pull: refs/heads/maint:refs/heads/maint\n> Pull: refs/heads/next:refs/heads/next\n> Pull: refs/heads/html:refs/heads/html\n> Pull: refs/heads/pu:refs/heads/pu\n> Pull: refs/heads/todo:refs/heads/todo\n> Pull: refs/heads/man:refs/heads/man\n\nThat's a layout that was default before 1.5.0, I think. 3 years is an eon\nin git timescale.\n\nPeople giving advice based on modern git experience would say things like\n\"origin/master\", but in your layout that ref that keeps track of where the\n'master' branch at the remote repository is is not called 'origin/master',\nbut simply 'origin'.\n\nSo instead of\n\n> Try either:\n> $ git checkout master\n> $ git reset --hard origin/master\n\nthat Sverre gave you, in your repository you would do:\n\n $ git checkout master\n $ git reset --hard origin\n"}]}