On both of my amd64 systems and my sparc SB1000 system, running FEATURES=test emerge -v =dev-util/git-1.5.5.1-r1 gives me: * FAIL 13: funny symlink in work tree, un-unlink-able and we are in t1004-read-tree-m-u-wf.sh Following the suggested debugging change in Bug 193134, I changed the test to look like: emake ${MY_MAKEOPTS} DESTDIR="${D}" GIT_TEST_OPTS="--verbose --debug" -C t \ t1004-read-tree-m-u-wf.sh || die "tests failed" Now, the output looks like this: ================================ ..... HEAD is now at c80710f side-a changes file1 error: Entry 'file2' not uptodate. Cannot merge. local changes * ok 11: 3-way not overwriting local changes (their side) * expecting success: git reset --hard && git checkout -b sym-b side-b && mkdir -p a && >a/b && git add a/b && git commit -m "side adds a/b" && rm -fr a && git checkout -b sym-a side-a && mkdir -p a && ln -s ../b a/b && git add a/b && git commit -m "we add a/b" && git read-tree -m -u sym-a sym-a sym-b HEAD is now at c80710f side-a changes file1 Switched to a new branch "sym-b" Created commit ef04664: side adds a/b 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 a/b Switched to a new branch "sym-a" Created commit 25ff353: we add a/b 1 files changed, 1 insertions(+), 0 deletions(-) create mode 120000 a/b * ok 12: funny symlink in work tree * expecting success: rm -fr a b && git reset --hard && git checkout sym-a && chmod a-w a && test_must_fail git read-tree -m -u sym-a sym-a sym-b HEAD is now at 25ff353 we add a/b Already on "sym-a" * FAIL 13: funny symlink in work tree, un-unlink-able <<<<<<<<<<<<<<<< rm -fr a b && git reset --hard && git checkout sym-a && chmod a-w a && test_must_fail git read-tree -m -u sym-a sym-a sym-b * expecting success: git reset --hard && git checkout side-a && rm -f subdir/file2 && mkdir subdir/file2 && echo qfwfq >subdir/file2/another && git add subdir/file2/another && test_tick && git commit -m "side-a changes file2 to directory" HEAD is now at 25ff353 we add a/b Switched to branch "side-a" Created commit 18ea470: side-a changes file2 to directory 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 100644 subdir/file2 create mode 100644 subdir/file2/another * ok 14: D/F setup * expecting success: git checkout side-b && git read-tree -m -u branch-point side-b side-a && git ls-files -u >actual && ( a=$(git rev-parse branch-point:subdir/file2) b=$(git rev-parse side-a:subdir/file2/another) echo "100644 $a 1 subdir/file2" echo "100644 $a 2 subdir/file2" echo "100644 $b 3 subdir/file2/another" ) >expect && test_cmp actual expect and so on. In case it matters, here's the emerge --info from the sparc system: =================================================================== fmccor@polylepis Snakes [500]% emerge --info Portage 2.2_pre5 (default-linux/sparc/sparc64/2007.0, gcc-4.1.2, glibc-2.6.1-r0, 2.6.25-rc7-SB1000 sparc64) ================================================================= System uname: 2.6.25-rc7-SB1000 sparc64 sun4u Timestamp of tree: Wed, 30 Apr 2008 11:34:01 +0000 distcc 2.18.3 sparc-unknown-linux-gnu (protocols 1 and 2) (default port 3632) [disabled] ccache version 2.4 [enabled] app-shells/bash: 3.2_p17-r1 dev-java/java-config: 1.3.7, 2.0.30 dev-lang/python: 2.4.4-r9 dev-python/pycrypto: 2.0.1-r6 dev-util/ccache: 2.4-r7 dev-util/confcache: 0.4.2-r1 sys-apps/baselayout: 1.12.11.1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.13, 2.61-r1 sys-devel/automake: 1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1 sys-devel/binutils: 2.18-r1 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.24 ABI="sparc32" ACCEPT_KEYWORDS="sparc" ALSA_CARDS="ca0106 cmipci ens1370 ens1371" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol" 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" ARCH="sparc" AUTOCLEAN="yes" CBUILD="sparc-unknown-linux-gnu" CDEFINE_sparc32="!__arch64__" CFLAGS="-O2 -pipe -mcpu=ultrasparc3" CFLAGS_sparc32="-m32" CHOST="sparc-unknown-linux-gnu" CHOST_sparc32="sparc-unknown-linux-gnu" CHOST_sparc64="sparc64-unknown-linux-gnu" CLASSPATH="." CLEAN_DELAY="5" CONFIG_PROTECT="/etc /usr/kde/3.3/env /usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/config /var/spool/torque" CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/java-config/vms/ /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c /etc/udev/rules.d" CPATH="/usr/include/libffi" CTARGETS_BINUTILS="sparc-unknown-linux-gnu sparc64-unknown-linux-gnu" CTARGET_sparc32="sparc-unknown-linux-gnu" CVS_RSH="ssh" CXXFLAGS="-O2 -pipe -mcpu=ultrasparc3" DCCC_PATH="/usr/lib/distcc/bin" DD="/jaz/portage/distfiles" DEBUG_CFLAGS="-O2 -mcpu=ultrasparc3 -pipe -g -D__GLX_ALIGN64" DEBUG_CXXFLAGS="-O1 -mcpu=ultrasparc3 -pipe -g -fno-inline-functions -D__GLX_ALIGN64" DEBUG_FFLAGS="-O2 -pipe -mcpu=ultrasparc3 -g" DEFAULT_ABI="sparc32" DISPLAY="liasis:0.0" DISTCC_DIR="/home0/ferris/.distcc" DISTCC_HOSTS="localhost/2 antaresia/2" DISTCC_LOG="" DISTCC_PATH="/usr/lib/distcc/bin" DISTCC_VERBOSE="0" DISTDIR="/usr/portage/distfiles" ECHANGELOG_EDITOR="/usr/bin/vim" EDITOR="/usr/bin/vim" ELIBC="glibc" EMERGE_DEFAULT_OPTS="--verbose" EMERGE_WARNING_DELAY="10" FEATURES="ccache cvs distlocks metadata-transfer parallel-fetch preserve-libs sandbox sfperms strict unmerge-orphans userfetch" FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O "${DISTDIR}/${FILE}" "${URI}"" FFLAGS="-O2 -pipe -mcpu=ultrasparc3" FLTK_DOCDIR="/usr/share/doc/fltk-1.1.7-r3/html" FREECIV_DATADIR="/home0/freeciv/share/freeciv" FREECIV_DIR="/home0/freeciv/share/freeciv" GCC_SPECS="" GDK_USE_XFT="1" GENTOO_MIRRORS="ftp://gentoo.mirrors.tds.net/gentoo http://gentoo.cites.uiuc.edu/pub/gentoo/ http://194.117.143.70 ftp://194.117.143.71/mirrors/gentoo http://194.117.143.69" GRASS_LD_LIBRARY_PATH="/usr/grass62/lib" GUILE_LOAD_PATH="/usr/share/guile/1.8" HOME="/homes/home0/ferris" ICEPY_HOME="/cache/IcePy-3.0.0/python" ICE_HOME="/cache/Ice-3.0.0" ICE_VERSION="3.0.0" INFOPATH="/usr/share/info:/usr/share/binutils-data/sparc-unknown-linux-gnu/2.18/info:/usr/share/gcc-data/sparc-unknown-linux-gnu/4.1.2/info:/opt/xmingw/info:/usr/share/info/emacs-22:/homes/cache/info" INPUT_DEVICES="evdev keyboard mouse" JAVAC="/usr/bin/jikes" JDK_HOME="" KDEDIRS="/usr:/usr/local:/usr/kde/3.5" KERNEL="linux" KERNEL_ABI="sparc64" LADSPA_PATH="/usr/lib/ladspa" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LC_ALL="en_US.utf8" LDFLAGS_sparc32="-m elf32_sparc" LDFLAGS_sparc64="-m elf64_sparc" LESS="-R -M --shift 5" LESSCHARSET="utf-8" LESSOPEN="|lesspipe.sh %s" LIBDIR_sparc32="lib" LOGNAME="fmccor" LS_COLORS="no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.pdf=00;32:*.ps=00;32:*.txt=00;32:*.patch=00;32:*.diff=00;32:*.log=00;32:*.tex=00;32:*.doc=00;32:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:" MAIL="/var/mail/fmccor" MAKEOPTS="-j2" MANPATH="/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/sparc-unknown-linux-gnu/2.18/man:/usr/share/gcc-data/sparc-unknown-linux-gnu/4.1.2/man:/opt/xmingw/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man:/opt/opera/share/man:/homes/cache/man" MULTILIB_ABIS="sparc32" NIGHTLY="http://www.open-mpi.org/nightly/v0.9/" NS="/home1/PROJECTS/SIMULATION/ALL-IN-ONE/NS28/bin/ns" NSDIR="/home1/PROJECTS/SIMULATION/ALL-IN-ONE/NS28/ns-2.28" OLDPWD="/homes/home0/ferris/Packages/SNAKES" OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg" OMPI="/home1/PROJECTS/OPEN-MPI" OPENGL_PROFILE="xorg-x11" PAGER="/usr/bin/less" PATH=".:/usr/local/lib/sablevm/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/sparc-unknown-linux-gnu/gcc-bin/4.1.2:/usr/sparc-unknown-linux-gnu/sparc64-unknown-linux-gnu/gcc-bin/4.1.2:/opt/xmingw/bin:/usr/kde/3.5/bin:/usr/qt/3/bin:/usr/kde/3.3/bin:/opt/firebird/bin:/usr/games/bin:/usr/share/omniORB/bin/scripts:/usr/sbin:/sbin" PBS_SERVER_HOME="/var/spool/torque" PD="/jaz/portage/packages" PKGDIR="/usr/portage/packages" PKG_CONFIG_PATH="/usr/qt/3/lib/pkgconfig" PORTAGE_ARCHLIST="ppc s390 amd64 x86 ppc64 x86-fbsd m68k arm sparc sh mips ia64 alpha hppa sparc-fbsd" PORTAGE_BINHOST_CHUNKSIZE="3000" PORTAGE_BIN_PATH="/usr/lib/portage/bin" PORTAGE_CONFIGROOT="/" PORTAGE_DEBUG="0" PORTAGE_DEPCACHEDIR="/var/cache/edb/dep" PORTAGE_ECLASS_WARNING_ENABLE="0" PORTAGE_ELOG_CLASSES="warn error log" PORTAGE_ELOG_MAILFROM="portage@localhost" PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for ${PACKAGE} on ${HOST}" PORTAGE_ELOG_MAILURI="root" PORTAGE_ELOG_SYSTEM="save" PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS="5" PORTAGE_GID="250" PORTAGE_INST_GID="0" PORTAGE_INST_UID="0" PORTAGE_PYM_PATH="/usr/lib/portage/pym" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_RSYNC_RETRIES="3" PORTAGE_TMPDIR="/var/tmp" PORTAGE_WORKDIR_MODE="0700" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/local/portage" PRELINK_PATH_MASK="/usr/lib/gstreamer-0.10:/usr/lib/gstreamer-0.8 /usr/lib/gstreamer-0.8" PROFILE_ARCH="sparc64" PS1="\[\033[01;32m\]\u@\h \[\033[01;31m\]\W [\#]% \[\033[00m\]" PS2="> " PWD="/homes/home0/ferris/Packages/SNAKES/Snakes" PYTHONPATH=":/cache/IcePy-3.0.0/python:/cache/IcePy-3.0.0/python" QMAKESPEC="linux-g++" QTDIR="/usr/qt/3" REMOTEHOST="liasis.inforead.com" RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O "${DISTDIR}/${FILE}" "${URI}"" ROOT="/" ROOTPATH="/opt/bin:/usr/sparc-unknown-linux-gnu/gcc-bin/4.1.2:/usr/sparc-unknown-linux-gnu/sparc64-unknown-linux-gnu/gcc-bin/4.1.2:/opt/xmingw/bin:/usr/kde/3.5/sbin:/usr/kde/3.5/bin:/usr/qt/3/bin:/usr/kde/3.3/sbin:/usr/kde/3.3/bin:/opt/firebird/bin:/homes/cache/bin" RPMDIR="/usr/portage/rpm" RUBYOPT="-rubygems" R_HOME="/usr/lib/R" SBCL_HOME="/usr/lib/sbcl" SBCL_SOURCE_ROOT="/usr/lib/sbcl/src" SCHEME_LIBRARY_PATH="/usr/share/slib/" SGML_CATALOG_FILES="/etc/sgml/sgml-ent.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/sgml-docbook-4.1.cat:/etc/sgml/sgml-docbook-4.0.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook-3.0.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/xml-simple-docbook-4.1.2.4.cat:/etc/sgml/xml-simple-docbook-1.0.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/xml-docbook-4.1.2.cat:/etc/sgml/sgml-docbook-4.2.cat:/etc/sgml/sgml-lite.cat" SHELL="/bin/bash" SHLVL="2" SSH_AGENT_PID="7377" SSH_AUTH_SOCK="/tmp/ssh-MiPVbP7376/agent.7376" SSH_CLIENT="192.168.1.213 45508 22" SSH_CONNECTION="192.168.1.213 45508 192.168.1.212 22" STAGE1_USE="nptl nptlonly unicode" SYNC="rsync://rsync.gentoo.org/gentoo-portage" TERM="xterm" TEXINPUTS="/usr/lib/ocaml/ocamldoc:" TMP="/tmp/.private/fmccor" TMPDIR="/tmp/.private/fmccor" USE="X Xaw3d alsa bzip2 cairo cli cracklib crypt cscope cups dri examples fortran gdbm gif glx gpm graphviz iconv idea isdnlog jpeg kerberos latex lzw-tiff midi mudflap mysql nls nptl nptlonly ogg opengl openmp pcre pdf perl png ppds pppd python reflection ruby ruby18 session sparc speex spl sqlite ssl stroke tcl tcltk tetex tex tiff tk truetype unicode vim-syntax vorbis xcb xetex xorg zlib" ALSA_CARDS="ca0106 cmipci ens1370 ens1371" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol" 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="glibc" INPUT_DEVICES="evdev keyboard mouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" USERLAND="GNU" VIDEO_CARDS="dummy fbdev sunffb" USER="fmccor" USERLAND="GNU" USE_EXPAND="ALSA_CARDS ALSA_PCM_PLUGINS APACHE2_MODULES APACHE2_MPMS CAMERAS CROSSCOMPILE_OPTS DVB_CARDS ELIBC FCDSL_CARDS FOO2ZJS_DEVICES FRITZCAPI_CARDS INPUT_DEVICES KERNEL LCD_DEVICES LINGUAS LIRC_DEVICES MISDN_CARDS USERLAND VIDEO_CARDS" USE_EXPAND_HIDDEN="CROSSCOMPILE_OPTS ELIBC KERNEL USERLAND" USE_ORDER="env:pkg:conf:defaults:pkginternal:env.d" VIDEO_CARDS="dummy fbdev sunffb" WANT_AUTOCONF="2.5" WANT_MP="true" WINDOWID="56623128" WINDOWMANAGER="/usr/bin/fvwm" XDG_DATA_DIRS="/usr/share:/usr/kde/3.5/share:/usr/local/share" XGUILOADPATH="/home1/ferris/Packages/SNNS/SNNSv4.2" XTERM_LOCALE="C" XTERM_SHELL="/bin/bash" XTERM_VERSION="XTerm(234)" _="/usr/bin/emerge" (And yes, I searched, and this does not show up as a duplicate of anything. :) )
Same problem for me on x86 hardened.
Please retest with 1.5.5.3 in the tree shortly.
Now t0004--unwritable.sh fails for me. New bug?
t1004 fails at 13 when tested by hand.
(In reply to comment #3) > Now t0004--unwritable.sh fails for me. New bug? > Yes, open a new one please. @fmmcor: Does this still happen with latest git? - ferdy
1.5.4.5 (bug 225231) passes all tests on sparc
And this test passes if ran with FEATURES="test userpriv" , fails without userpriv.
On 1.5.5.3-r1, btw.
t1004 disabled in 1.6.0 if root.
