Message: previous - next
Month: October 2012

Re: [trinity-devel] What happend to GIT?

From: Darrell Anderson <humanreadable@...>
Date: Sat, 6 Oct 2012 10:39:14 -0700 (PDT)
> > > I notice many modules no longer have a ".git" subdirectory.
> >
> > That would cause problems, but I would suspect a haywire script or similar
> > on your end has simply deleted those directories.  Running "git submodule
> > init" and "git submodule update" from within the main tde/ directory
> > should restore those directories and reset your copy to the latest GIT
> > HEAD.
> >
> > Please let me know if you run into any further issues; for obvious reasons
> > I am concerned at even the slightest hint that the main GIT repository
> > could possibly be corrupt!
> I have not noticed any problems with GIT. I even tried to
> clone a complete tree and no problems I noticed (except for the usual slow
> speed). Maybe you have just broken your local copy.
> You can try:
> git fsck && git submodule foreach "git fsck"
> Note: Submodules may not have .git folder, but may have .git
> file that points to the location git folder in the top level object (in
> .git/modules).

I have tried all of the above to no avail. The git fsck commands results in several "dangling blob," dangling tree," and "dangling tag" messages.

When I attempt to resync my entire local tree, the process always hangs at kmplayer. When I enter that directory and run 'git pull' I receive the following message:

You are not currently on a branch, so I cannot use any
'branch.<branchname>.merge' in your configuration file.
Please specify which remote branch you want to use on the command
line and try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

I get the same error message from several modules, such as tdeadmin.

This all started last night when I wanted to push a simple editorial patch for tdeadmin for the kcontrol network module to recognize the newly released Slackware 14.

I have tried to enter each defective module and run 'git checkout master' but that does not help. The process just hangs with no messages at all.

I've tried following the directions in the wiki. I ran 'git clone' for the entire tree and that has not helped.

What do I try next?