Dear Scott, In message <1404169793.2435.204.ca...@snotra.buserror.net> you wrote: > > > (git) diff needs a reference to diff against. Maybe I missed some > > earlier comments about that, but how exactly should this be done > > here? > > When the code is synced, the corresponding Linux SHA1 or tag should be > placed in the commit message. This is the case for the NAND code. > Unfortunately it has never been true of the mtd/ubi code, but this > do-over in those trees is an opportunity to fix that.
Heiko already did that. > There is no intermediate step. > > The unmodified source is in the Linux tree -- most likely in a more > accurate/complete form than the ifdefs convey, since minor differences > and subsequent local changes are unlikely to be marked. > > You can either fetch the Linux tree into your local U-Boot repo (or vice > versa) so that git diff can compare them, or you can check out separate > repositories to the proper tags/SHAs and use ordinary diff. It's not > something that I'd expect one to want to do very often, though. Usually Are you talking here about the theoretitical possibility to do that, or have you actually done that - and found the result useful? Maybe I'm doing something wrong, but I get such a huge volume of new resp. deleted files that I find it really, really hard to see any diffs at all. > you want to know how things work in the codebase you're working on, or > you want to compare some specific aspect of the code which can more > easily be done manually. Hm... I think I know what you have in mind. But did you actually try this out with the given code base? One problem I see is that the changes are scattered across the directory tree; we have changes in drivers/mtd, fs/ubifs, include/linux/mtd, and in include/mtd . I am not connvinced that this is a reliable way to study all changes; it seems too easy to me to miss some. Note that I would like to follow your advice, but it is just not working in a sensible way to me, and I wonder if I'm doing something wrong. Maybe you could share the commands to generate such a diff between the U-Boot and the Linux sources - something that generates output equivalent running "git-format-patch --stdout HEAD^.." in Heiko's tree? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de I read part of it all the way through. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
