Re: GIT tree broken? (rsync depreciated)

[Christian Kujau <evil@g-house.de>]

Stelian Pop schrieb:
> After resyncing cogito to the latest version (which incorporates the
> 'pack' changes, which were causing the failure), it does indeed work
> again, when using rsync.
> 

hm, i haven't updated my git-tree (linux-2.6.git) for a while and i got
similiar error messages. i updated cogito to:

% cg-version
cogito-0.12.1 (cbec08d191d36126ddaf021961cc8995794b4a72)

and the "cannot map sha1 file..." errors went away. now i get:

Applying changes...
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read a18bcb7450840f07a772a45229de4811d930f461
Merging 99f95e5286df2f69edab8a04c7080d986ee4233b ->
514fd7fd01d378a7b5584c657d9807fc28f22079
        to 62351cc38d3eaf3de0327054dd6ebc039f4da80d...
fatal: failed to unpack tree object bda3910b7737a4fac464792657ffedcba185d799
cg-merge: git-read-tree failed (merge likely blocked by local changes)

i *think* i did not make any local changes, but if i did - i want to get
rid ofthem and want a clean tree.

cg-status prints a lot of files with a "D" in front of it but "cg-status
-h" does not know about the "D" status flag....

any hints for this one?

thank you,
Christian.
-- 
BOFH excuse #378:

Operators killed by year 2000 bug bite.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/