6 Oct
2012
6 Oct
'12
6:27 a.m.
Is the main GIT repo hosed? I can't sync, git
pull, git diff, git
commit.
Looks OK from here:
http://git.trinitydesktop.org/cgit/
http://www.trinitydesktop.org/patches/
I am also doing a full test checkout from GIT for verification and have
not run into any errors so far.
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!
Tim
6 Oct
6 Oct
2:39 p.m.
New subject: [trinity-devel] What happend to GIT?
On Saturday 06 of October 2012 08:27:04 Timothy Pearson wrote:
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).
Slavek
--
Is the main
GIT repo hosed? I can't sync, git pull, git diff, git
commit.
Looks OK from here:
http://git.trinitydesktop.org/cgit/
http://www.trinitydesktop.org/patches/
I am also doing a full test checkout from GIT for verification and have
not run into any errors so far.
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!
Tim
5:39 p.m.
New subject: [trinity-devel] What happend to GIT?
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!
7:01 p.m.
New subject: [trinity-devel] What happend to GIT?
I notice many
modules no longer have a ".git" subdirectory.
That would cause problems, but I would suspect a haywire script or 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).
7:15 p.m.
New subject: [trinity-devel] What happend to GIT?
Have you checked your hard drive recently? Any disk
issues could cause a mess in GIT, and I would argue could be likely to show up in
GIT before anything else simply because the entire GIT tree uses many
tens of thousands of small files.
Nothing wrong with the drive. Just yesterday when booting the scheduled fsck ran on that
partition.
I was able to sync the tree after moving the contents of the kmplayer directory. Sort of
--- nothing filled in to replace the missing files. I still get the "You are not
currently on a branch..." messages with many modules.
I don't want to waste 4+ GB of bandwidth recreating a whole new local tree, but I
don't know what else to do. Not to mention that with a new tree none of the modules
will have my user name in the config files.
Darrell
7:23 p.m.
New subject: [trinity-devel] What happend to GIT?
Have you
checked your hard drive recently? Any disk
issues could cause a mess in GIT, and I would argue could be likely to
show up in
GIT before anything else simply because the entire GIT tree uses many
tens of thousands of small files.
Nothing wrong with the drive. Just yesterday when booting the scheduled
fsck ran on that partition.
I was able to sync the tree after moving the contents of the kmplayer
directory. Sort of --- nothing filled in to replace the missing files. I
still get the "You are not currently on a branch..." messages with many
modules.
I don't want to waste 4+ GB of bandwidth recreating a whole new local
tree, but I don't know what else to do. Not to mention that with a new
tree none of the modules will have my user name in the config files.
Darrell 
7:29 p.m.
New subject: [trinity-devel] What happend to GIT?
Check for filenames that might have accidentally had a carriage return
inserted, or space entered at the front or end of the file name. That
has caused me very similar problems to what you describe in the past
when using CLI tools.
Konqueror can search for a leading or trailing space: ( *) or (* ),
don't use the (). I don't know (other than visually) how to search
for a carriage return.
Keith
On Sat, Oct 6, 2012 at 2:15 PM, Darrell Anderson
<humanreadable(a)yahoo.com> wrote:
Have you
checked your hard drive recently? Any disk
issues could cause a mess in GIT, and I would argue could be likely to show up in
GIT before anything else simply because the entire GIT tree uses many
tens of thousands of small files.
Nothing wrong with the drive. Just yesterday when booting the scheduled fsck ran on that
partition.
I was able to sync the tree after moving the contents of the kmplayer directory. Sort of
--- nothing filled in to replace the missing files. I still get the "You are not
currently on a branch..." messages with many modules.
I don't want to waste 4+ GB of bandwidth recreating a whole new local tree, but I
don't know what else to do. Not to mention that with a new tree none of the modules
will have my user name in the config files.
Darrell
---------------------------------------------------------------------
To unsubscribe, e-mail: trinity-devel-unsubscribe(a)lists.pearsoncomputing.net
For additional commands, e-mail: trinity-devel-help(a)lists.pearsoncomputing.net
Read list messages on the web archive: http://trinity-devel.pearsoncomputing.net/
Please remember not to top-post:
http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
7 Oct
7 Oct
12:10 a.m.
New subject: [trinity-devel] What happend to GIT?
On Saturday 06 of October 2012 21:15:18 Darrell Anderson wrote:
To clean up the dangling objects use:
git prune && git submodule foreach "git prune"
When are broken only some submodules, there is no need to re-clone the whole
repository. It is sufficient to delete the relevant module folder and his git
folder. If submodule not have git folder in his directory, you will find it
in the top level .git/modules/_path_, for example:
.git/modules/main/tdelibs
After removing is needed to do:
git submodule init && git submodule update
This will re-clone only submodules that were previously removed.
Slavek
--
Have you
checked your hard drive recently? Any disk
issues could cause a mess in GIT, and I would argue could be likely to
show up in GIT before anything else simply because the entire GIT tree
uses many tens of thousands of small files.
Nothing wrong with the drive. Just yesterday when booting the scheduled
fsck ran on that partition.
I was able to sync the tree after moving the contents of the kmplayer
directory. Sort of --- nothing filled in to replace the missing files. I
still get the "You are not currently on a branch..." messages with many
modules.
I don't want to waste 4+ GB of bandwidth recreating a whole new local tree,
but I don't know what else to do. Not to mention that with a new tree none
of the modules will have my user name in the config files.
Darrell
9 Oct
9 Oct
1:08 p.m.
New subject: [trinity-devel] What happend to GIT?
On 6 Oct 2012, Darrell Anderson uttered the following:
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.
These are not signs of fs corruption unless you get lots of them: they
just mean that some content is inaccessible. This can happen
legitimately, e.g. a rebase followed by the usual automatic gc prune of
the reflog.
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.
You should probably be using 'git pull' in the top-level followed by
'git submodule update'. When a submodule is checked out in its parent,
it is pointing at a single specific commit, thus is not on any branch
(it's at a point in the past history of some branch instead). So
'git pull' isn't going to be happy when it reaches its merge phase and
tries to merge its recent changes into what it has already seen.
This is harmless, and is indeed expected when you are not on a branch.
The hang.. the hang is *not* expected.
I get the same error message from several modules,
such as tdeadmin.
It's not an error -- not exactly, anyway. If you just want to fetch and
not update, you should be using 'git fetch' or 'git remote update'; if
you want to update a submodule, you should be using 'git submodule
update'. There is little reason to do a 'git pull' in a submodule.
--
NULL && (void)
4458
days inactive
4461
days old
8 comments
5 participants
participants (5)
-
Darrell Anderson -
Keith Daniels -
Nix -
Slávek Banko -
Timothy Pearson