[chromium-dev] Re: Git woes

2009-08-28 Thread Alex Riesen
On Thu, Aug 27, 2009 at 23:07, Nico Webertha...@chromium.org wrote: I accidentally fixed the problem by running something like  rm -rf .git/svn/  git svn fetch; This one is most likely, the next one being the git pull. ... git merge trunk  git merge refs/remotes/origin/trunk  git

[chromium-dev] Re: Git woes

2009-08-27 Thread Nico Weber
Not knowingly, at least. `git --version` says 1.6.0.2, which I believe is what it always said. On Wed, Aug 26, 2009 at 10:50 PM, Jeremy Moskovichjer...@chromium.org wrote: Git is comprised of billions of tiny orthogonal binaries. When this happened to me the cause was some old git binaries in

[chromium-dev] Re: Git woes

2009-08-27 Thread Evan Martin
Aside from basic stuff like running out of disk space, I have no idea what would cause this problem. (It's weird that pread would fail with no such file when its API is to take an open file descriptor.) One workaround might be to try setting this defined, mentioned in the Makefile: # Define

[chromium-dev] Re: Git woes

2009-08-27 Thread Evan Martin
https://kerneltrap.org/mailarchive/git/2007/7/23/252538 old and maybe obsolete, but has some exposition from Linus On Thu, Aug 27, 2009 at 7:51 AM, Evan Martine...@chromium.org wrote: Aside from basic stuff like running out of disk space, I have no idea what would cause this problem.  (It's

[chromium-dev] Re: Git woes

2009-08-27 Thread Evan Martin
Try git gc On Thu, Aug 27, 2009 at 8:27 AM, Nico Webertha...@chromium.org wrote: The pack file truncated theory sounds most likely. Is there any way I could tell git to regenerate the newest N packfiles? On Thu, Aug 27, 2009 at 8:00 AM, Evan Martine...@chromium.org wrote:

[chromium-dev] Re: Git woes

2009-08-27 Thread Nico Weber
The pack file truncated theory sounds most likely. Is there any way I could tell git to regenerate the newest N packfiles? On Thu, Aug 27, 2009 at 8:00 AM, Evan Martine...@chromium.org wrote: https://kerneltrap.org/mailarchive/git/2007/7/23/252538 old and maybe obsolete, but has some

[chromium-dev] Re: Git woes

2009-08-27 Thread Nico Weber
Didn't help. Oh well, back to my fallback svn client for now. Will create a new git checkout in the new feature. On Thu, Aug 27, 2009 at 9:12 AM, Evan Martine...@chromium.org wrote: Try git gc On Thu, Aug 27, 2009 at 8:27 AM, Nico Webertha...@chromium.org wrote: The pack file truncated

[chromium-dev] Re: Git woes

2009-08-27 Thread Dimitri Glazkov
I've had this issue before and found that if I used svn rebase it would sometimes fix it. So I am thinking perhaps instead of git pull, you could attempt doing git fetch first and then git merge? This would do the same thing, except not in atomic op. :DG On Thu, Aug 27, 2009 at 10:49 AM, Nico

[chromium-dev] Re: Git woes

2009-08-27 Thread Nico Weber
I accidentally fixed the problem by running something like rm -rf .git/svn/ git svn fetch; git merge trunk git merge refs/remotes/origin/trunk git checkout -f HEAD git pull . Not sure what fixed it, but pulling works again. Yay, I guess, but of course I fixed it about 2 minutes before

[chromium-dev] Re: Git woes

2009-08-26 Thread Jeremy Moskovich
Git is comprised of billions of tiny orthogonal binaries. When this happened to me the cause was some old git binaries in the path that where being called by others, the version mismatch was silent and caused this error. Have you upgraded to a new version of git recently that might cause such a