[git-users] Out of memory, malloc failied (tried to allocate 2306150400 bytes )

2013-10-10 Thread praveenm mulimani
Dear All, We are using windows 7 to download the git source through repo command. We are getting the below error (although we have 20 GB free space). Fatal: Out of memory, malloc failied (tried to allocate 2306150400 bytes ) Git version: 1.8.3.msysgit.0 Git configuration details:

[git-users] Re: Out of memory, malloc failied (tried to allocate 2306150400 bytes )

2013-10-10 Thread praveenm mulimani
On Thursday, October 10, 2013 4:27:11 PM UTC+5:30, praveenm mulimani wrote: Dear All, We are using windows 7 to download the git source through repo command. We are getting the below error (although we have 20 GB free RAM). Fatal: Out of memory, malloc failied (tried to allocate

Re: [git-users] Out of memory, malloc failied (tried to allocate 2306150400 bytes )

2013-10-10 Thread Konstantin Khomoutov
On Thu, 10 Oct 2013 03:57:11 -0700 (PDT) praveenm mulimani praveen.mulim...@gmail.com wrote: We are using windows 7 to download the git source through repo command. We are getting the below error (although we have 20 GB free space). Fatal: Out of memory, malloc failied (tried to allocate

Re: [git-users] Out of memory, malloc failied (tried to allocate 2306150400 bytes )

2013-10-10 Thread Dale R. Worley
From: Konstantin Khomoutov flatw...@users.sourceforge.net pack.packsizelimit=2g pack.threads=1 pack.windowmemory=256m 2. I'd say the pack.packSizeLimit should not affect the packing behaviour -- at least that's what I gather from the manual page. The git-config manual page says:

Re: [git-users] Out of memory, malloc failied (tried to allocate 2306150400 bytes )

2013-10-10 Thread Konstantin Khomoutov
On Thu, 10 Oct 2013 11:19:27 -0400 wor...@alum.mit.edu (Dale R. Worley) wrote: pack.packsizelimit=2g pack.threads=1 pack.windowmemory=256m 2. I'd say the pack.packSizeLimit should not affect the packing behaviour -- at least that's what I gather from the manual page. The

[git-users] Easy question about merging

2013-10-10 Thread Eric Fowler
I am a git newbie but have used other SCMs. I have two branches, master and X. Both have changes, both have been committed. X has a lot of refactoring changes, master has a few bug fixes I don't want to lose. I want to merge X into master. But I'm chicken. What if the merge fails and leaves

[git-users] Easy question about merging

2013-10-10 Thread Huu Da Tran
If you really want to stay on the safe side, this would be the easiest and safest for you. git checkout branchX git checkout -b branchX-merge-master git merge master fix any conflicts, do your tests. Commit conflict changes. When you are happy, repeat git merge master Until everything is up