Luben Tuikov <ltuikov@xxxxxxxxx> writes: > This time it happens when merging one of my git trees into another: > ... > And here is the backtrace: > > $gdb ~/bin/git-merge-recursive > GNU gdb 6.5 > Copyright (C) 2006 Free Software Foundation, Inc. > GDB is free software, covered by the GNU General Public License, and you are > welcome to change it and/or distribute copies of it under certain conditions. > Type "show copying" to see the conditions. > There is absolutely no warranty for GDB. Type "show warranty" for details. > This GDB was configured as "i686-pc-linux-gnu"...Using host libthread_db library > "/lib/libthread_db.so.1". > > (gdb) run 777f68432f1db967573e5722bf0fd08af05e748f -- HEAD > d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7 > Starting program: /home/luben/bin/git-merge-recursive 777f68432f1db967573e5722bf0fd08af05e748f -- > HEAD d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7 > Failed to read a valid object file image from memory. Who says this? > Merging HEAD with d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7 > Merging: > 52d5052 Merge branch 'git-upstream' into git-lt-work > d985fda Merge branch 'next' into git-upstream > found 1 common ancestor(s): > 777f684 Merge branch 'next' into git-upstream > Auto-merging .gitignore > > Program received signal SIGSEGV, Segmentation fault. > 0x08070469 in xdl_merge (orig=0xbff3aae0, mf1=0xbff3aad8, > name1=0x80f5208 "HEAD:.gitignore", mf2=0xbff3aad0, > name2=0x80f59a8 "d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7:.gitignore", > xpp=0xbff3aae8, level=2, result=0xbff3aac8) at xdiff/xmerge.c:200 > warning: Source file is more recent than executable. > 200 */ What local mods are you running with? - To unsubscribe from this list: 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