Dear diary, on Mon, Apr 18, 2005 at 03:22:43PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > Hi
Hi, I should release early and often. :-) > Tree change: > c29b3b29c2861ab0ffb475c7a7c9cfc946106eaf:5bf2f464d382b0bd746d06e264bc6951e7bfcd3a > Tracked branch, applying changes... > error: bad signature > error: verify header failed > read_cache: Invalid argument > error: bad signature > error: verify header failed > error: bad signature > error: verify header failed this is a known problem, caused by the directory cache index format change (to fix endianity issues). You can solve it by doing read-tree $(tree-id) update-cache --refresh (if you are reading this and didn't to the problematic pull yet, do it right after you get git-pasky-base, do your first pull and rebuild; you won't get into problems that way). To recover, do this now, and then do: (i) if you have local commits: git merge -b c29b3b29c2861ab0ffb475c7a7c9cfc946106eaf \ 5bf2f464d382b0bd746d06e264bc6951e7bfcd3a (ii) if you don't have local commits: git diff -r c29b3b29c2861ab0ffb475c7a7c9cfc946106eaf:5bf2f464d382b0bd746d06e264bc6951e7bfcd3a \ | git apply I'm thinking how to handle future directory cache changes. Doing read-tree $(tree-id) && update-cache --refresh on the kernel tree is fast (three seconds?) if you have it in cache already, but SLOOOOOW (more than a minute) if you have cold cache; so I wouldn't do it always. I think I will do something like check-cache which will just return exitcode based on whether the cache is ok or not, and do this time in the git multiplexer. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html