{"thread":{"id":"6153","subject":"SIGSEGV in merge recursive","startedAt":"2006-12-29T19:49:43Z","lastAt":"2006-12-31T02:30:59Z","messageCount":8,"participants":["Luben Tuikov","Junio C Hamano","Johannes Schindelin","Florian Weimer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"30487","messageId":"699806.13055.qm@web31803.mail.mud.yahoo.com","threadId":"6153","inReplyTo":null,"subject":"SIGSEGV in merge recursive","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-29T19:49:43Z","receivedAt":"2006-12-29T19:49:43Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"This time it happens when merging one of my git trees into another:\n\n$git-pull . git-upstream\nTrying really trivial in-index merge...\nfatal: Merge requires file-level merging\nNope.\ngit-merge-recursive 777f68432f1db967573e5722bf0fd08af05e748f -- HEAD\nd985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\nMerging HEAD with d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\nMerging:\n52d5052 Merge branch 'git-upstream' into git-lt-work\nd985fda Merge branch 'next' into git-upstream\nfound 1 common ancestor(s):\n777f684 Merge branch 'next' into git-upstream\nAuto-merging .gitignore\n/home/luben/bin/git-merge: line 441: 2889 Segmentation fault git-merge-$strategy $common --\n\"$head_arg\" \"$@\"\nMerge with strategy recursive failed.\n\n(git-upstream has already had \"next\" merged into it without a problem.)\n\nAnd here is the backtrace:\n\n$gdb ~/bin/git-merge-recursive\nGNU gdb 6.5\nCopyright (C) 2006 Free Software Foundation, Inc.\nGDB is free software, covered by the GNU General Public License, and you are\nwelcome to change it and/or distribute copies of it under certain conditions.\nType \"show copying\" to see the conditions.\nThere is absolutely no warranty for GDB. Type \"show warranty\" for details.\nThis GDB was configured as \"i686-pc-linux-gnu\"...Using host libthread_db library\n\"/lib/libthread_db.so.1\".\n\n(gdb) run 777f68432f1db967573e5722bf0fd08af05e748f -- HEAD\nd985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\nStarting program: /home/luben/bin/git-merge-recursive 777f68432f1db967573e5722bf0fd08af05e748f --\nHEAD d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\nFailed to read a valid object file image from memory.\nMerging HEAD with d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\nMerging:\n52d5052 Merge branch 'git-upstream' into git-lt-work\nd985fda Merge branch 'next' into git-upstream\nfound 1 common ancestor(s):\n777f684 Merge branch 'next' into git-upstream\nAuto-merging .gitignore\n\nProgram received signal SIGSEGV, Segmentation fault.\n0x08070469 in xdl_merge (orig=0xbff3aae0, mf1=0xbff3aad8, \n name1=0x80f5208 \"HEAD:.gitignore\", mf2=0xbff3aad0, \n name2=0x80f59a8 \"d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7:.gitignore\", \n xpp=0xbff3aae8, level=2, result=0xbff3aac8) at xdiff/xmerge.c:200\nwarning: Source file is more recent than executable.\n200 */\n(gdb) bt\n#0 0x08070469 in xdl_merge (orig=0xbff3aae0, mf1=0xbff3aad8, \n name1=0x80f5208 \"HEAD:.gitignore\", mf2=0xbff3aad0, \n name2=0x80f59a8 \"d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7:.gitignore\", \n xpp=0xbff3aae8, level=2, result=0xbff3aac8) at xdiff/xmerge.c:200\n#1 0x0804a6c2 in merge_file (o=0xbff3accc, a=0xbff3ac74, b=0xbff3aca0, \n branch1=0xbff3c928 \"HEAD\", \n branch2=0xbff3c92d \"d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\")\n at merge-recursive.c:660\n#2 0x0804c296 in merge_trees (head=0x80924c8, merge=0x80924e8, \n common=0x8092508, branch1=, \n branch2=, result=0xbff3add0) at merge-recursive.c:1067\n#3 0x0804c9cd in merge (h1=0x80874c0, h2=0x8087544, \n branch1=0xbff3c928 \"HEAD\", \n branch2=0xbff3c92d \"d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\", \n call_depth=0, ancestor=0x8087518, result=0xbff3ae24)\n at merge-recursive.c:1238\n#4 0x0804cc78 in main (argc=3, argv=0xbff3aea4) at merge-recursive.c:1320\n\n Luben\n"},{"id":"30488","messageId":"7v7iwampi4.fsf@assigned-by-dhcp.cox.net","threadId":"6153","inReplyTo":"699806.13055.qm@web31803.mail.mud.yahoo.com","subject":"Re: SIGSEGV in merge recursive","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-29T20:11:15Z","receivedAt":"2006-12-29T20:11:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Luben Tuikov writes:\n\n> This time it happens when merging one of my git trees into another:\n> ...\n> And here is the backtrace:\n>\n> $gdb ~/bin/git-merge-recursive\n> GNU gdb 6.5\n> Copyright (C) 2006 Free Software Foundation, Inc.\n> GDB is free software, covered by the GNU General Public License, and you are\n> welcome to change it and/or distribute copies of it under certain conditions.\n> Type \"show copying\" to see the conditions.\n> There is absolutely no warranty for GDB. Type \"show warranty\" for details.\n> This GDB was configured as \"i686-pc-linux-gnu\"...Using host libthread_db library\n> \"/lib/libthread_db.so.1\".\n>\n> (gdb) run 777f68432f1db967573e5722bf0fd08af05e748f -- HEAD\n> d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\n> Starting program: /home/luben/bin/git-merge-recursive 777f68432f1db967573e5722bf0fd08af05e748f --\n> HEAD d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\n> Failed to read a valid object file image from memory.\n\nWho says this?\n\n> Merging HEAD with d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\n> Merging:\n> 52d5052 Merge branch 'git-upstream' into git-lt-work\n> d985fda Merge branch 'next' into git-upstream\n> found 1 common ancestor(s):\n> 777f684 Merge branch 'next' into git-upstream\n> Auto-merging .gitignore\n>\n> Program received signal SIGSEGV, Segmentation fault.\n> 0x08070469 in xdl_merge (orig=0xbff3aae0, mf1=0xbff3aad8, \n> name1=0x80f5208 \"HEAD:.gitignore\", mf2=0xbff3aad0, \n> name2=0x80f59a8 \"d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7:.gitignore\", \n> xpp=0xbff3aae8, level=2, result=0xbff3aac8) at xdiff/xmerge.c:200\n> warning: Source file is more recent than executable.\n> 200 */\n\nWhat local mods are you running with?\n"},{"id":"30490","messageId":"898450.11823.qm@web31804.mail.mud.yahoo.com","threadId":"6153","inReplyTo":"7v7iwampi4.fsf@assigned-by-dhcp.cox.net","subject":"Re: SIGSEGV in merge recursive","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-29T20:24:52Z","receivedAt":"2006-12-29T20:24:52Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"--- Junio C Hamano wrote:\n> Luben Tuikov writes:\n> \n> > This time it happens when merging one of my git trees into another:\n> > ...\n> > And here is the backtrace:\n> >\n> > $gdb ~/bin/git-merge-recursive\n> > GNU gdb 6.5\n> > Copyright (C) 2006 Free Software Foundation, Inc.\n> > GDB is free software, covered by the GNU General Public License, and you are\n> > welcome to change it and/or distribute copies of it under certain conditions.\n> > Type \"show copying\" to see the conditions.\n> > There is absolutely no warranty for GDB. Type \"show warranty\" for details.\n> > This GDB was configured as \"i686-pc-linux-gnu\"...Using host libthread_db library\n> > \"/lib/libthread_db.so.1\".\n> >\n> > (gdb) run 777f68432f1db967573e5722bf0fd08af05e748f -- HEAD\n> > d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\n> > Starting program: /home/luben/bin/git-merge-recursive 777f68432f1db967573e5722bf0fd08af05e748f\n> --\n> > HEAD d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\n> > Failed to read a valid object file image from memory.\n> \n> Who says this?\n> \n> > Merging HEAD with d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7\n> > Merging:\n> > 52d5052 Merge branch 'git-upstream' into git-lt-work\n> > d985fda Merge branch 'next' into git-upstream\n> > found 1 common ancestor(s):\n> > 777f684 Merge branch 'next' into git-upstream\n> > Auto-merging .gitignore\n> >\n> > Program received signal SIGSEGV, Segmentation fault.\n> > 0x08070469 in xdl_merge (orig=0xbff3aae0, mf1=0xbff3aad8, \n> > name1=0x80f5208 \"HEAD:.gitignore\", mf2=0xbff3aad0, \n> > name2=0x80f59a8 \"d985fdaf7a4b8b1dde313c8fad12983dc4ce20f7:.gitignore\", \n> > xpp=0xbff3aae8, level=2, result=0xbff3aac8) at xdiff/xmerge.c:200\n> > warning: Source file is more recent than executable.\n> > 200 */\n> \n> What local mods are you running with?\n\nNot much -- the one-offs you've sent to git and me to fix various\nproblems I've complained about, some scripts of mine which have nothing\nto do with merging. The log of the commits diff between next and\ngit-lt-work doesn't show anything in the merge area -- only things\nI've been active in like gitweb, etc.\n\n Luben\n"},{"id":"30496","messageId":"Pine.LNX.4.63.0612301204280.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6153","inReplyTo":"898450.11823.qm@web31804.mail.mud.yahoo.com","subject":"Re: SIGSEGV in merge recursive","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-30T11:07:47Z","receivedAt":"2006-12-30T11:07:47Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 29 Dec 2006, Luben Tuikov wrote:\n\n> > > Failed to read a valid object file image from memory.\n> > \n> > Who says this?\n\nAgain, who says this? I cannot find _anything_ in my local repo (with its \nown set of modifications, which do not hide such a message).\n\nGiven that there is a fix in master for a segfault, I have to admit that I \nbelieve you did not use _that_ version, but a git without that fix.\n\nBesides, Alexandre hit an interesting bug, which is not at all easy to \nreproduce (except with three 70k files which I don't want to include in \nthe test set). Since Alexandre provided _examples_ where I can _reproduce_ \nthe problem, I will be working on that bug, and not yours.\n\nCiao,\nDscho\n"},{"id":"30499","messageId":"87ac15txlz.fsf@mid.deneb.enyo.de","threadId":"6153","inReplyTo":"Pine.LNX.4.63.0612301204280.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: SIGSEGV in merge recursive","fromName":"Florian Weimer","fromEmail":"fw@deneb.enyo.de","sentAt":"2006-12-30T11:46:32Z","receivedAt":"2006-12-30T11:46:32Z","isPatch":false,"sender":{"key":"fw@deneb.enyo.de","avatar":null},"body":"* Johannes Schindelin:\n\n>> > > Failed to read a valid object file image from memory.\n>> > \n>> > Who says this?\n>\n> Again, who says this?\n\nIt's a GDB message.\n"},{"id":"30525","messageId":"10871.51671.qm@web31801.mail.mud.yahoo.com","threadId":"6153","inReplyTo":"Pine.LNX.4.63.0612301204280.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: SIGSEGV in merge recursive","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-31T01:42:06Z","receivedAt":"2006-12-31T01:42:06Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"--- Johannes Schindelin wrote:\n> On Fri, 29 Dec 2006, Luben Tuikov wrote:\n> \n> > > > Failed to read a valid object file image from memory.\n> > > \n> > > Who says this?\n> \n> Again, who says this? I cannot find _anything_ in my local repo (with its \n> own set of modifications, which do not hide such a message).\n\nGDB. This message is not present when I run it manually from shell prompt.\n\n> Given that there is a fix in master for a segfault, I have to admit that I \n> believe you did not use _that_ version, but a git without that fix.\n\nA-ha! Since I never run master, after I read your message, I compiled\nmaster, installed it and tried the same merge/pull and it succeeded -- i.e.\ndidn't segfault, but complained about unresolved conflicts (as it should).\n\nSo it appears that the fix is in \"master\", but not in \"next\".\n\nJunio, can you confirm this?\n\n Luben\n\n\n> Besides, Alexandre hit an interesting bug, which is not at all easy to \n> reproduce (except with three 70k files which I don't want to include in \n> the test set). Since Alexandre provided _examples_ where I can _reproduce_ \n> the problem, I will be working on that bug, and not yours.\n> \n> Ciao,\n> Dscho\n> \n> \n"},{"id":"30533","messageId":"308309.87460.qm@web31805.mail.mud.yahoo.com","threadId":"6153","inReplyTo":"Pine.LNX.4.63.0612301204280.19693@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: SIGSEGV in merge recursive","fromName":"Luben Tuikov","fromEmail":"ltuikov@yahoo.com","sentAt":"2006-12-31T02:13:55Z","receivedAt":"2006-12-31T02:13:55Z","isPatch":false,"sender":{"key":"ltuikov@yahoo.com","avatar":null},"body":"--- Johannes Schindelin wrote:\n> Besides, Alexandre hit an interesting bug, which is not at all easy to \n> reproduce (except with three 70k files which I don't want to include in \n> the test set). Since Alexandre provided _examples_ where I can _reproduce_ \n> the problem, I will be working on that bug, and not yours.\n\nAfter compiling and installing \"master\" I was able to do the pull/merge.\nThe only conflict was in .gitignore, and it was that same conflict that\nwas causing the segfault. Normally (99% of the time) I pull\n\"next\" into branchA (git-upstream), then I pull branchA into branchB (git-lt-work).\nBoth have various fixes, but I normally install and use branchB (git-lt-work).\n\nIt appears that that fix was in \"next\" which I hadn't already merged, and running\nwith an old \"next\" didn't allow me to the the \"merge\" since the fix for it was\nin the \"next\" I was trying to merge...\n\nThus I needed to install \"master\" as is (\"next\" as is, would've worked just\nas well), which contains the fix for the merge, so that I can merge the\nbranch which contains the fix (\"next\"/branchA).\n\nI tested this and tried the exact same merge, with the newly merged and installed\nbranchB/git-lt-work, and it did work.\n\nSo it's all good now. Thanks!\n Luben\n"},{"id":"30534","messageId":"7vvejshk4c.fsf@assigned-by-dhcp.cox.net","threadId":"6153","inReplyTo":"10871.51671.qm@web31801.mail.mud.yahoo.com","subject":"Re: SIGSEGV in merge recursive","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-31T02:30:59Z","receivedAt":"2006-12-31T02:30:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Luben Tuikov writes:\n\n> So it appears that the fix is in \"master\", but not in \"next\".\n>\n> Junio, can you confirm this?\n\nIt was merged into 'next' with 1e48a691, about 2 hours after I\nmerged the fix 5d6b151f to 'master'. Sometimes when I have a\nfix that is urgent enough, I push out only 'master' before\nmerging and retesting it in 'next', so it is plausible that your\nfetch grabbed such a state.\n"}]}