{"thread":{"id":"17464","subject":"Bus Error- git merge","startedAt":"2009-01-30T18:15:44Z","lastAt":"2009-02-01T22:48:31Z","messageCount":4,"participants":["Brian Moran","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"102633","messageId":"C5A883D0.E243%bmoran@onehub.com","threadId":"17464","inReplyTo":null,"subject":"Bus Error- git merge","fromName":"Brian Moran","fromEmail":"bmoran@onehub.com","sentAt":"2009-01-30T18:15:44Z","receivedAt":"2009-01-30T18:15:44Z","isPatch":false,"sender":{"key":"bmoran@onehub.com","avatar":null},"body":"I am getting a bus error on a git merge, including the more recent versions.\nFollowing the instructions from a bug August, I got the latest sources,\ncompiled them up, and executed the merge in the debugger to repro. Here¹s\nwhat I found:\n\ngdb ../git-1.6.1.2/git-merge\nGNU gdb 6.3.50-20050815 (Apple version gdb-768) (Tue Oct 2 04:07:49 UTC\n2007)\nCopyright 2004 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\nconditions.\nType \"show copying\" to see the conditions.\nThere is absolutely no warranty for GDB. Type \"show warranty\" for details.\nThis GDB was configured as \"i386-apple-darwin\"...Reading symbols for shared\nlibraries ........ done\n\n(gdb) set args -v v1-ftp-support\n(gdb) run\nStarting program: /Users/bmo/Documents/repo/git-1.6.1.2/git-merge -v\nv1-ftp-support\nReading symbols for shared libraries +++++++. done\n\nProgram received signal EXC_BAD_ACCESS, Could not access memory.\nReason: KERN_PROTECTION_FAILURE at address: 0x00000004\n0x000863c3 in sha_eq (a=0x4
, b=0x7bf004 \"\") at cache.h:575\n575 return memcmp(sha1, sha2, 20);\n\n(gdb) backtrace\n#0 0x000863c3 in sha_eq (a=0x4
, b=0x7bf004\n\"\") at cache.h:575\n#1 0x00086dc6 in merge_trees (o=0xbfffedd4, head=0x7bf020, merge=0x7bf000,\ncommon=0x0, result=0xbfffed28) at merge-recursive.c:1164\n#2 0x00088960 in merge_recursive (o=0xbfffedd4, h1=0x4f4060, h2=0x4f4000,\nca=0x53cc20, result=0xbfffee2c) at merge-recursive.c:1294\n#3 0x0003871c in try_merge_strategy (strategy=0xd28ce \"recursive\",\ncommon=0x53a040, head_arg=0xc3508 \"HEAD\") at builtin-merge.c:586\n#4 0x00039fef in cmd_merge (argc=1, argv=0xbffff860, prefix=0x0) at\nbuiltin-merge.c:1131\n#5 0x000025db in handle_internal_command (argc=3, argv=0xbffff860) at\ngit.c:243\n#6 0x00002c48 in main (argc=3, argv=0xbffff860) at git.c:453\n(gdb) \nAny suggestions on how to proceed? I am available to gather more information\non this as I can reproduce at will.\nThanks,\nBrian Moran\n\nhttp://www.onehub.com\n"},{"id":"102636","messageId":"alpine.DEB.1.00.0901301950100.3586@pacific.mpi-cbg.de","threadId":"17464","inReplyTo":"C5A883D0.E243%bmoran@onehub.com","subject":"Re: Bus Error- git merge","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-01-30T18:57:15Z","receivedAt":"2009-01-30T18:57:15Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 30 Jan 2009, Brian Moran wrote:\n\n> I am getting a bus error on a git merge, including the more recent versions.\n> Following the instructions from a bug August, I got the latest sources,\n> compiled them up, and executed the merge in the debugger to repro. Here¹s\n> what I found:\n\nIs it possible that your branch has submodules?\n\n> gdb ../git-1.6.1.2/git-merge\n> GNU gdb 6.3.50-20050815 (Apple version gdb-768) (Tue Oct 2 04:07:49 UTC\n> 2007)\n> Copyright 2004 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\n> 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 \"i386-apple-darwin\"...Reading symbols for shared\n> libraries ........ done\n> \n> (gdb) set args -v v1-ftp-support\n> (gdb) run\n> Starting program: /Users/bmo/Documents/repo/git-1.6.1.2/git-merge -v\n> v1-ftp-support\n> Reading symbols for shared libraries +++++++. done\n> \n> Program received signal EXC_BAD_ACCESS, Could not access memory.\n> Reason: KERN_PROTECTION_FAILURE at address: 0x00000004\n> 0x000863c3 in sha_eq (a=0x4
, b=0x7bf004 \" random chars>\") at cache.h:575\n> 575 return memcmp(sha1, sha2, 20);\n> \n> (gdb) backtrace\n> #0 0x000863c3 in sha_eq (a=0x4
, b=0x7bf004\n> \"\") at cache.h:575\n> #1 0x00086dc6 in merge_trees (o=0xbfffedd4, head=0x7bf020, merge=0x7bf000,\n> common=0x0, result=0xbfffed28) at merge-recursive.c:1164\n\ncommon=0x0, that's the issue.\n\n> #2 0x00088960 in merge_recursive (o=0xbfffedd4, h1=0x4f4060, h2=0x4f4000,\n> ca=0x53cc20, result=0xbfffee2c) at merge-recursive.c:1294\n\nHowever, here I read in my version of merge-recursive.c that \"common\" is \nthe tree of merged_common_ancestor, which is either set to \n\"pop_commit(&ca)\", i.e. to one of the common ancestors, or to a virtual \ncommit, that must have a tree.\n\nSo it would be good if you could debug this further, letting me know where \nthe merged_common_ancestor came from, and why it does not have a tree.\n\nThanks,\nDscho"},{"id":"102663","messageId":"C5A8D5E0.E29D%bmoran@onehub.com","threadId":"17464","inReplyTo":"alpine.DEB.1.00.0901301950100.3586@pacific.mpi-cbg.de","subject":"Re: Bus Error- git merge","fromName":"Brian Moran","fromEmail":"bmoran@onehub.com","sentAt":"2009-01-31T00:05:52Z","receivedAt":"2009-01-31T00:05:52Z","isPatch":false,"sender":{"key":"bmoran@onehub.com","avatar":null},"body":"With subsequent changes to the merged-to repository, the bug does not\nmanifest. I will attempt to reproduce when we encounter it next.\n \n\n\nOn 1/30/09 10:57 AM, \"Johannes Schindelin\" \nwrote:\n\n> Hi,\n> \n> On Fri, 30 Jan 2009, Brian Moran wrote:\n> \n>> I am getting a bus error on a git merge, including the more recent versions.\n>> Following the instructions from a bug August, I got the latest sources,\n>> compiled them up, and executed the merge in the debugger to repro. Here¹s\n>> what I found:\n> \n> Is it possible that your branch has submodules?\n> \n"},{"id":"102792","messageId":"alpine.DEB.1.00.0902012346130.3586@pacific.mpi-cbg.de","threadId":"17464","inReplyTo":"C5A8D5E0.E29D%bmoran@onehub.com","subject":"Re: Bus Error- git merge","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-02-01T22:48:31Z","receivedAt":"2009-02-01T22:48:31Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 30 Jan 2009, Brian Moran wrote:\n\n> With subsequent changes to the merged-to repository, the bug does not\n> manifest. I will attempt to reproduce when we encounter it next.\n\nPlease do not top-post; it is annoying. If that is not good enough a \nreason for you to avoid it: it is also against the customs in this list.\n\nSecond, it is a pity that you did not work with me to resolve the issue. \nI would have liked to squash this bug very much, but your unwillingness to \nwork with me on the bug does not make me enthusiastic about trying to help \nyou in the future. As it is, my time writing the mails to you seems to \nhave been wasted.\n\nCiao,\nDscho\n"}]}