The following sequence, which is a fairly commonplace scenario IMHO, causes a Bus Error with the current git version but does not occur with git built on OSX from mainline. In a nutshell : cherry-picking doesn't work. I'm not really sure whether this is to be reported here or on the git lists but since the latest upstream git doesn't seem to have this problem, perhaps the need of the hour is to upgrade ? Note that I am pretty much a gentoo prefix noob so excuse me if this is all redundant. $ mkdir /tmp/test-git $ cd /tmp/test-git $ echo "dummy data 1" > dummy-file $ git add dummy-file $ git commit -m "dummy commit 1" $ echo "dummy data 2" >> dummy-file $ git add dummy-file $ git commit -m "dummy commit 2" $ git log commit d14c0158abe81086a87e22dee429e8057327560d Author: John Doe <john.doe@dead.com> Date: Fri May 21 13:54:57 2010 +0100 dummy commit 2 commit 333b1b5d3d11733b9ca164bd44978471dca3a980 Author: John Doe <john.doe@dead.com> Date: Fri May 21 13:54:28 2010 +0100 dummy commit 1 $ git checkout -b dummy-branch 333b1b5d3d11733b9ca164bd44978471dca3a980 $ git cherry-pick d14c0158abe81086a87e22dee429e8057327560d Bus Error Some details of my setup: $ emerge --info Portage 2.2.00.15842-prefix (prefix/darwin/macos/10.6/x86, gcc-4.2.1, unavailable, 10.3.0 i386) ================================================================= System uname: Darwin-10.3.0-i386-32bit Timestamp of tree: Fri, 21 May 2010 11:08:03 +0000 distcc 3.1-toolwhip.1 i386-apple-darwin10.0 [disabled] app-shells/bash: 4.0_p38 dev-lang/python: 2.6.5-r2 sys-devel/autoconf: 2.65 sys-devel/automake: 1.10.2-r00.1, 1.11.1 sys-devel/binutils: 2.20.51.0.5 sys-devel/gcc-config: 1.4.1-r00.2 sys-devel/libtool: 2.2.6b ACCEPT_KEYWORDS="~x86-macos" ACCEPT_LICENSE="* -@EULA" CBUILD="i686-apple-darwin10" CFLAGS="-O2 -pipe -march=nocona" CHOST="i686-apple-darwin10" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/revdep-rebuild /etc/terminfo" CXXFLAGS="-O2 -pipe -march=nocona" DISTDIR="/Users/robin/CodeBox/gentoo/usr/portage/distfiles" FEATURES="assume-digests collision-protect distlocks fixpackages news nostrip parallel-fetch preserve-libs protect-owned sfperms strict unmerge-logs unmerge-orphans userfetch" GENTOO_MIRRORS="http://distfiles.gentoo.org" LANG="en_GB.UTF-8" LDFLAGS="" PKGDIR="/Users/robin/CodeBox/gentoo/usr/portage/packages" PORTAGE_CONFIGROOT="/Users/robin/CodeBox/gentoo/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/Users/robin/CodeBox/gentoo/var/tmp" PORTDIR="/Users/robin/CodeBox/gentoo/usr/portage" PORTDIR_OVERLAY="/Users/robin/CodeBox/gentoo/usr/local/portage" SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix" USE="aqua coreaudio cracklib cxx mmx mmxext modules ncurses nls objc objc++ prefix readline sse sse2 ssl unicode x86-macos zlib" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="Darwin" INPUT_DEVICES="keyboard mouse" KERNEL="Darwin" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" RUBY_TARGETS="ruby18" USERLAND="GNU" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, LINGUAS, MAKEOPTS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS ================================================================= Package Settings ================================================================= dev-vcs/git-1.7.1 was built with the following: USE="bash-completion blksha1 curl cvs perl (prefix) subversion threads webdav -cgi -doc -emacs -gtk -iconv (-ppcsha1) -tk -xinetd"
what is "git built on mainline"? another version of git? the same version of git built with other compilers?
(In reply to comment #1) > what is "git built on mainline"? another version of git? the same version of > git built with other compilers? Sorry, I should have been more clear. I meant that if I build git under gentoo prefix using the latest git sources from : <http://www.codemonkey.org.uk/projects/git-snapshots/git/git-latest.tar.gz> .. then the resulting git binary doesn't exhibit the aforementioned Bus Error while cherry-picking commits.
Ok, thanks, so the latest version in Gentoo is just faulty. Means we have to wait for a new release. Is that acceptable to you?
(In reply to comment #3) > Ok, thanks, so the latest version in Gentoo is just faulty. Means we have to > wait for a new release. Is that acceptable to you? Sure. For the moment, I will continue to work with a manual build. I suppose the bug will remain open until the new release, yes ? Also, were you (or anyone else) able to reproduce the problem at all ? Thanks.
I have dev-vcs/git-1.7.0.2 installed, and your example works fine on my G5/PPC 10.4 machine with that version. I just installed 1.7.1 and get the same Bus Error. I guess we could mask it in the meantime.
flameeyes looked into this issue in detail
*** This bug has been marked as a duplicate of bug 321895 ***
