1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2

A couple of people noticed that the latest commit in the "master" branch seems, eh, odd.

It was not a screw-up of any of the git tools, just me screwing up in an early morning/late night editing session when checking things in.

    $ git whatchanged -p --max-count=1 <that commit>

shows the true story. The commit message has the excess, but the patch for the commit has exactly the thing I wanted it to have and nothing else.

My policy is not to rewind "master" and "rc" once it hits the public repository; otherwise it would make pulling from these branches unnecessarily confusing for other people.

Although it is embarrassing, the screw-up this case is only the commit log message, and running "git revert" once and then "git revert" again would not make it less confusing, so I will keep things as they are.

Junio C Hamano wrote:

Seems to me that this breaks http update

cg-update http://www.kernel.org/pub/scm/git/git.git

error: Tried http://www.kernel.org/pub/scm/git/git.git/objects/6f/f87c4664981e4397625791c8ea3bbb5f2279a3 Cannot obtain needed blob 6ff87c4664981e4397625791c8ea3bbb5f2279a3 while processing commit 1dfcfbce2d643b7c7b56dc828f36ced9de2bf9f2. cg-pull: objects pull failed

Dirk

Dirk Behme <dirk.behme@de.bosch.com> writes:

I suspect that your copy of Cogito/git is old and incapable of fetching from a packed repository. Did your Cogito come with its own copy of git (specifically, git-http-pull)? Modern Cogito "cg-pull" uses git-http-pull from core GIT as its underlying pull driver for http transport, which should not have the problem anymore.

Junio C Hamano wrote:

My cogito source directory has no git* files any more. I update directly from git.git and cogito.git. Last time this was done last week (wednesday, thursday?). Is this old? I have no problems with cg-update using http of cogito.git. I think cogito.git uses packed repository as well?

Many thanks

Dirk

Dirk Behme <dirk.behme@de.bosch.com> writes:

Let's clarify one thing first. Did you mean "git rebuilt from the sources obtained from that seemingly-odd commit, http update does not work anymore", or did you mean "starting from the state my repository happened to be in, attempting to pull from the git.git repository did not work, and the master branch head of git.git public repository was that commit"?

First we need to make sure your git binary from last week wednesday or thursday is recent enough. I think you need at least this commit:

    Author: Daniel Barkalow <barkalow@iabervon.org>
    Date:   Thu Aug 11 23:17:55 2005 -0400

        [PATCH] Also parse objects we already have

        In the case where we don't know from context what type
        an object is, but we don't have to fetch it, we need to
        parse it to determine the type before processing it.

If your git binary turns out to be recent enough, then the state of your repository is needed to diagnose this problem. What do these command tell you in your git.git repository that cg-pull from the public repository fails?

    $ git fsck-cache | grep -v '^dangling '
    $ git ls-remote --heads ./.
    $ ls .git/objects/pack

[Note to people who are interested in what I plan to do with the
 output from the above commands.  If fsck-cache reports any
 anomaly other than dangling objects, that means the repository
 before pulling is corrupt and the problem is not in http-pull.

 Otherwise, I can first make a clone of my git.git repository
 while expanding all the packs, overwrite the head references to
 what "git ls-remotes" reports for Dirk's repository, run "git
 prune" to lose objects Dirk would not have, and then try
 running git-http-pull myself.  

 What set of packs Dirk has (and does not have) is there for
 sanity checking --- if he has packs that I do not have myself,
 that means he packed his repository himself.  Which is not an
 illegal thing to do at all, and I do not think that would
 affect the operation of http-pull, it would be a good thing to
 know while digging deeper, hence the request for that
 information. ]