lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 24 Sep 2006 15:22:13 +0200 From: Petr Baudis <pasky@....cz> To: Russell King <rmk+lkml@....linux.org.uk> Cc: linux-kernel@...r.kernel.org Subject: Re: 2.6.18-mm1 Dear diary, on Sun, Sep 24, 2006 at 02:46:47PM CEST, I got a letter where Russell King <rmk+lkml@....linux.org.uk> said that... > On Sun, Sep 24, 2006 at 04:02:15AM -0700, Andrew Morton wrote: > > git-arm.patch > > It's worth pointing out that something has gone horribly wrong in the > devel branch of this tree, resulting in a load of files being deleted > which shouldn't have been. > > Absolutely no idea how that happened, but it's a commit buried behind > lots of other commits and has taken some 4 days to be spotted. At a > guess, a perl bug where a new associative array somehow manages to pick > up on old values and forget values from previous assignments. > > Oddly, running the script in debug mode (where the only things which > don't happen is the git commands get called) appears to give correct > behaviour. > > So I'm in the situation where I need to rebuild 4 days work in the ARM > devel tree. ;( If I understand correctly, you just need to get rid of that bad commit? Can you copy the missing files (in the suitable tree structure) to /tmp/missing/ and try this? cg-admin-rewritehist -r EVILCOMMIT \ --tree-filter 'cp -r /tmp/missing/* .' \ --commit-filter \ 'if [ "$GIT_COMMIT" = "EVILCOMMIT" ]; then shift; while [ -n "$1" ]; do shift; echo "$1"; shift; done; else git-commit-tree "$@"; fi' \ fixedbranch (s/EVILCOMMIT/thesha1id/) Now check if fixedbranch looks ok. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ #!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj $/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1 lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists