Re: git status --> Out of memory, realloc failed

2017-03-03 Thread Carsten Fuchs
Hi René, Am 02.03.2017 um 21:04 schrieb René Scharfe: When I use ulimit -v with lower and lower numbers I can provoke mmap failures on bigger pack files, but not the realloc failures that you're seeing. And your packs should be only up to 20MB anyway (you can check that with "ls -l .git/objects

Re: git status --> Out of memory, realloc failed

2017-03-03 Thread Carsten Fuchs
Hi Duy, Am 2017-03-02 um 10:31 schrieb Duy Nguyen: You could also try "git fast-export --anonymize" (read the doc first). Eventually this was not needed, but thanks for letting me know about it! I've not been aware of this feature beforehand, learned something. Best regards, Carsten

Re: git status --> Out of memory, realloc failed

2017-03-01 Thread Carsten Fuchs
Hi René, Am 01.03.2017 um 11:02 schrieb René Scharfe: I use Git at a web hosting service, where my user account has a memory limit of 768 MB: (uiserver):p7715773:~$ uname -a Linux infongp-de15 3.14.0-ui16322-uiabi1-infong-amd64 #1 SMP Debian 3.14.79-2~ui80+4 (2016-11-17) x86_64 GNU/Linux What

git status --> Out of memory, realloc failed

2017-02-25 Thread Carsten Fuchs
run `git gc`. This seemed to work well – but `git status` still fails: (uiserver):p7715773:~/cafu$ cat ~/.gitconfig [color] ui = auto [user] name = Carsten Fuchs email = carsten.fu...@cafu.de [core] editor = nano pager = less -M -FRXS packedgitwindowsize = 30m

Re: Tracking vendor release with Git

2013-06-12 Thread Carsten Fuchs
\ \ \ K---L--M--N--O <-- downstream branch ("master" in above linked text) Best regards, Carsten -- Dipl.-Inf. Carsten Fuchs Carsten Fuchs Software Industriegebiet 3, c/o Rofu, 55768 Hoppstädten-Weiersbach, Germany Internet: http://www.cafu.de | E-Mail: i

Re: git merge error question: The following untracked working tree files would be overwritten by merge

2013-01-26 Thread Carsten Fuchs
Am 2013-01-25 19:07, schrieb Junio C Hamano: Carsten Fuchs writes: [...] $ git merge origin/master --ff-only Updating f419d57..2da6052 error: The following untracked working tree files would be overwritten by merge: obsolete/e107/Readme.txt obsolete/e107/article.php

git merge error question: The following untracked working tree files would be overwritten by merge

2013-01-25 Thread Carsten Fuchs
Hi all, in my repo, I'm doing this: > $ git status > # On branch master > # Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. > # > # Untracked files: > # (use "git add ..." to include in what will be committed) > # > # obsolete/ > nothing added to commit bu