{"thread":{"id":"1610","subject":"1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2","startedAt":"2005-08-21T18:49:47Z","lastAt":"2005-08-23T01:07:18Z","messageCount":5,"participants":["Junio C Hamano","Dirk Behme"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7612","messageId":"7vy86vf7lg.fsf@assigned-by-dhcp.cox.net","threadId":"1610","inReplyTo":null,"subject":"1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-08-21T18:49:47Z","receivedAt":"2005-08-21T18:49:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"A couple of people noticed that the latest commit in the\n\"master\" branch seems, eh, odd.\n\nIt was not a screw-up of any of the git tools, just me screwing\nup in an early morning/late night editing session when checking\nthings in.\n\n $ git whatchanged -p --max-count=1 \n\nshows the true story. The commit message has the excess, but\nthe patch for the commit has exactly the thing I wanted it to\nhave and nothing else.\n\nMy policy is not to rewind \"master\" and \"rc\" once it hits the\npublic repository; otherwise it would make pulling from these\nbranches unnecessarily confusing for other people.\n\nAlthough it is embarrassing, the screw-up this case is only the\ncommit log message, and running \"git revert\" once and then \"git\nrevert\" again would not make it less confusing, so I will keep\nthings as they are.\n"},{"id":"7628","messageId":"43096B50.60605@de.bosch.com","threadId":"1610","inReplyTo":"7vy86vf7lg.fsf@assigned-by-dhcp.cox.net","subject":"Re: 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2","fromName":"Dirk Behme","fromEmail":"dirk.behme@de.bosch.com","sentAt":"2005-08-22T06:06:08Z","receivedAt":"2005-08-22T06:06:08Z","isPatch":false,"sender":{"key":"dirk.behme@de.bosch.com","avatar":null},"body":"Junio C Hamano wrote:\n\n> A couple of people noticed that the latest commit in the\n> \"master\" branch seems, eh, odd.\n\nSeems to me that this breaks http update\n\ncg-update http://www.kernel.org/pub/scm/git/git.git\n\nerror: Tried \nhttp://www.kernel.org/pub/scm/git/git.git/objects/6f/f87c4664981e4397625791c8ea3bbb5f2279a3\nCannot obtain needed blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3\nwhile processing commit 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2.\ncg-pull: objects pull failed\n\nDirk\n"},{"id":"7627","messageId":"7vpss6bel3.fsf@assigned-by-dhcp.cox.net","threadId":"1610","inReplyTo":"43096B50.60605@de.bosch.com","subject":"Re: 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-08-22T07:44:40Z","receivedAt":"2005-08-22T07:44:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Dirk Behme writes:\n\n> Seems to me that this breaks http update\n>\n> cg-update http://www.kernel.org/pub/scm/git/git.git\n>\n> error: Tried \n> http://www.kernel.org/pub/scm/git/git.git/objects/6f/f87c4664981e4397625791c8ea3bbb5f2279a3\n> Cannot obtain needed blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3\n> while processing commit 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2.\n> cg-pull: objects pull failed\n\nI suspect that your copy of Cogito/git is old and incapable of\nfetching from a packed repository. Did your Cogito come with\nits own copy of git (specifically, git-http-pull)? Modern\nCogito \"cg-pull\" uses git-http-pull from core GIT as its\nunderlying pull driver for http transport, which should not have\nthe problem anymore.\n"},{"id":"7626","messageId":"430988A7.60906@de.bosch.com","threadId":"1610","inReplyTo":"7vpss6bel3.fsf@assigned-by-dhcp.cox.net","subject":"Re: 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2","fromName":"Dirk Behme","fromEmail":"dirk.behme@de.bosch.com","sentAt":"2005-08-22T08:11:19Z","receivedAt":"2005-08-22T08:11:19Z","isPatch":false,"sender":{"key":"dirk.behme@de.bosch.com","avatar":null},"body":"Junio C Hamano wrote:\n\n> Dirk Behme writes:\n> \n> \n>>Seems to me that this breaks http update\n>>\n>>cg-update http://www.kernel.org/pub/scm/git/git.git\n>>\n>>error: Tried \n>>http://www.kernel.org/pub/scm/git/git.git/objects/6f/f87c4664981e4397625791c8ea3bbb5f2279a3\n>>Cannot obtain needed blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3\n>>while processing commit 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2.\n>>cg-pull: objects pull failed\n> \n> \n> I suspect that your copy of Cogito/git is old and incapable of\n> fetching from a packed repository. Did your Cogito come with\n> its own copy of git (specifically, git-http-pull)? Modern\n> Cogito \"cg-pull\" uses git-http-pull from core GIT as its\n> underlying pull driver for http transport, which should not have\n> the problem anymore.\n\nMy cogito source directory has no git* files any more. I update directly \nfrom git.git and cogito.git. Last time this was done last week \n(wednesday, thursday?). Is this old? I have no problems with cg-update \nusing http of cogito.git. I think cogito.git uses packed repository as well?\n\nMany thanks\n\nDirk\n"},{"id":"7633","messageId":"7v64tx1mwp.fsf@assigned-by-dhcp.cox.net","threadId":"1610","inReplyTo":"430988A7.60906@de.bosch.com","subject":"Re: 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-08-23T01:07:18Z","receivedAt":"2005-08-23T01:07:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Dirk Behme writes:\n\n>>>Seems to me that this breaks http update\n\nLet's clarify one thing first. Did you mean \"git rebuilt from\nthe sources obtained from that seemingly-odd commit, http update\ndoes not work anymore\", or did you mean \"starting from the state\nmy repository happened to be in, attempting to pull from the\ngit.git repository did not work, and the master branch head of\ngit.git public repository was that commit\"?\n\nFirst we need to make sure your git binary from last week\nwednesday or thursday is recent enough. I think you need at\nleast this commit:\n\n Author: Daniel Barkalow \n Date: Thu Aug 11 23:17:55 2005 -0400\n\n [PATCH] Also parse objects we already have\n\n In the case where we don't know from context what type\n an object is, but we don't have to fetch it, we need to\n parse it to determine the type before processing it.\n\n\nIf your git binary turns out to be recent enough, then the state\nof your repository is needed to diagnose this problem. What do\nthese command tell you in your git.git repository that cg-pull\nfrom the public repository fails?\n\n $ git fsck-cache | grep -v '^dangling '\n $ git ls-remote --heads ./.\n $ ls .git/objects/pack\n\n[Note to people who are interested in what I plan to do with the\n output from the above commands. If fsck-cache reports any\n anomaly other than dangling objects, that means the repository\n before pulling is corrupt and the problem is not in http-pull.\n\n Otherwise, I can first make a clone of my git.git repository\n while expanding all the packs, overwrite the head references to\n what \"git ls-remotes\" reports for Dirk's repository, run \"git\n prune\" to lose objects Dirk would not have, and then try\n running git-http-pull myself. \n\n What set of packs Dirk has (and does not have) is there for\n sanity checking --- if he has packs that I do not have myself,\n that means he packed his repository himself. Which is not an\n illegal thing to do at all, and I do not think that would\n affect the operation of http-pull, it would be a good thing to\n know while digging deeper, hence the request for that\n information. ]\n"}]}