-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Am 16.05.2010 22:58, Jonathan Nieder wrote: > found 542709 git-core/1:1.6.5-1 > quit > > Uli Schlachter wrote: > >> this happened to me the day I wrote the mail to this bug (google found this >> bug >> report while I was looking for a solution). > [...] >> /var/log/dpkg.log.3.gz:2010-02-08 15:51:57 status installed git-core >> 1:1.6.6.1-1 >> /var/log/dpkg.log.7.gz:2009-10-26 19:55:00 status installed git-core >> 1:1.6.5-1 > > Drat. > > Agh, grasping at straws: > > . was $GREP_OPTIONS set? (rebase did not protect itself until v1.6.5.5~11^2)
Never heard about this variable and certainly didn't set it myself (and it's not currently set). > . does your repo track any symbolic links? Nope. > . were there any directories whose name was a prefix of a filename, > with the next character in the filename being a symbol that is > below '/' in ASCII, like "a/b/foo" directory and "a/b/foo-bar" file? Uhm, what? Looking at $RANDOM_ASCII_TABLE, only '-' and '.' could really be the reason here. 'find | grep -- -' only lists untracked files (and a single file where there is no suitable directory) '.' is a little more common in file names here, that calls for a oneliner: $ for x in $( git ls-files | sed -e 's:^./::' | grep '\.' | cut -f1 -d.) ; do [ -e "$x" ] && [ 0 != $(git ls-files "$x" | wc -l) ] && echo "$x" ; done This finds the following directory/file combinations (Omitting stuff like configure / configure.in since configure is not a directory): doxygen/manpages/ doxygen/manpages.cfg oflog/include/dcmtk/oflog/config/ oflog/include/dcmtk/oflog/config.h I don't know if any of these were part of the conflict, but this might well be possible > . any submodules? Nope, this is a cvs import via git cvsimport. Everyone else uses cvs. :( Uli - -- - - Buck, when, exactly, did you lose your mind? - - Three months ago. I woke up one morning married to a pineapple. An ugly pineapple... But I loved her! -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAEBCAAGBQJL8Sd5AAoJECLkKOvLj8sGNbsIANU2P2PG/+97x1eOa+DqkaLT YeeRrhq0ybFIOR+mmcdq2sy6Mz8mQVQrpPeD1wbd9puTsOvqEibR+GbIknjvcjjh wDeV3eAPJJX0N2jXVhLoh2nlFBw2+jlEjXwV+O5/qLAm1dLbXH6LwSA+awYUEztr Tx2nc05f7Gnbrf100ZlfZzxQbhfdKFwjKp02z+owyfl/IcL7MdgA4HZtc+FuE5Mk vZfbvol1OwkHa8EELJhGjBx3Da7AdPgJ9UOP7zNZbDLxJdVs0xid+VS9o04bfP/2 DKVjnw+QJND+7nBaHUSSg16NqUx6tY/BbjuGuNUOspNEMUs5Rvjy1I4cfkSWla4= =55/K -----END PGP SIGNATURE----- -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
