It would really be useful if git diff had an option for suppressing diffs caused by CVS keyword expansion. I run into this problem over and over when trying to recover stuff out of old kernel sources that people checked into CVS and then posted CVS diffs to fulfill their GPL obligations. I sometimes wonder if vendors are doing this on purpose to make it more difficult to recover the changes they made to the code. To prevent this in the future, I'd love to see a patch removing all CVS keywords from the kernel sources. Quick grep of kernel shows 1,535 $Id, 197 $Log, 441 $Revision, 144 $Date. I guestimate that this would remove about 5,000 lines form the kernel source and touch 1,700 files. Would this be accept or do those expansions contain useful info? Example diff caused by $Log expansion: diff --git a/arch/cris/kernel/ptrace.c b/arch/cris/kernel/ptrace.c index b3d10fb..32e47ca 100644 --- a/arch/cris/kernel/ptrace.c +++ b/arch/cris/kernel/ptrace.c @@ -8,6 +8,9 @@ * Authors: Bjorn Wesen * * $Log: ptrace.c,v $ + * Revision 1.2 2003/06/26 21:08:16 vangool + * Commit kernel changes. + * * Revision 1.8 2001/11/12 18:26:21 pkj * Fixed compiler warnings. * Or in this case the person edited out all of the lines in the kernel containing $Id diff --git a/arch/i386/boot/tools/build.c b/arch/i386/boot/tools/build.c index 2edd0a4..792aeb1 100644 --- a/arch/i386/boot/tools/build.c +++ b/arch/i386/boot/tools/build.c @@ -1,5 +1,4 @@ /* - * $Id: build.c,v 1.5 1997/05/19 12:29:58 mj Exp $ * * Copyright (C) 1991, 1992 Linus Torvalds * Copyright (C) 1997 Martin Mares A variation on this where the Id was updated.. - * $Id: build.c,v 1.5 1997/05/19 12:29:58 mj Exp $ + * $Id: build.c,v 1.5 2002/09/29 12:29:58 mj Exp $ There are a more CVS keywords that can cause expansion, probably around twenty. When removing these with a simple grep it can get fooled and mess up. CVS keyword expansion adds about 60,000 lines of noise to a typical diff. -- Jon Smirl jonsmirl@xxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
