On 26 July 2015 at 13:00, Leif Lindholm <[email protected]> wrote: > On Sun, Jul 26, 2015 at 11:40:11AM +0200, Ard Biesheuvel wrote: > ... >> diff --git a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf >> b/ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf >> similarity index 64% >> copy from ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf >> copy to ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf >> index 9f9ba729967c..d71b2adc3027 100644 >> --- a/ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf >> +++ b/ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf >> @@ -1,6 +1,6 @@ >> -#/** @file >> +#/* @file >> +# Copyright (c) 2015, Linaro Ltd. All rights reserved. >> # >> -# Copyright (c) 2012-2013, ARM Ltd. All rights reserved.<BR> > > So, this looks a bit funky. > Git has identified this as a derivate of another file, and this diff > makes it look like you're replacing the copyright statement. > (And, yes, I know it's just a .inf.) > Can you either do something about the diff or append to rather than > replace the copyright? >
This is a result of using --find-copies-harder: it will mostly do the right thing, and prevent huge patches at review time, but sometimes, it decides some unrelated file was used as the template for a newly added file. This will not show up in the repository, though. If you apply the patches and look at git log -p, it will look entirely normal. -- Ard. _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
