While looking at allowing empty lines in grafts files, I discovered that comments had already been implemented. However, current git-read-tree segfaults when there is a comment line in info/grafts: dwitch@gandelf:/export/work/yann/git/git$ cat .git/info/grafts c118c026e44f02c3dbad00d924285eef2340f700 # foo dwitch@gandelf:/export/work/yann/git/git$ git-read-tree master Segmentation fault The commit introducing the problem is 5040f17eba15504bad66b14a645bddd9b015ebb7 (blame -S <ancestry-file>), which changes quite some things in the grafts area. BTW, after segfaulting, .git/index.lock is still there, and the "unable to create new cachefile" is not so helpful - I had to strace to see what was happenning. Hope this helps, -- Yann Dirson <ydirson@xxxxxxxxxx> | Debian-related: <dirson@xxxxxxxxxx> | Support Debian GNU/Linux: | Freedom, Power, Stability, Gratis http://ydirson.free.fr/ | Check <http://www.debian.org/> - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html