On Tue, 6 May 2008, Matthew Wilcox wrote:
> On Tue, May 06, 2008 at 05:39:48PM +0100, Alan Cox wrote:
> > > > Hmm?
> > >
> > > So that find_conflict doesn't end up in the first column, which causes
> > > diff to treat it as a function name for the purposes of the @@ lines.
> >
> > Please can we just fix the tools not mangle the kernel to work around
> > silly bugs ?
>
> The people who control the tools refuse to fix them.
That's just plain bullocks.
First off, that "@@" line thing in diffs is not important enough to screw
up the source code for. Ever. It's just a small hint to make it somewhat
easier to see more context for humans.
Second, it's not even that bad to show the last label there, rather than
the function name.
Third, you seem to be a git user, so if you actually really care that much
about the @@ line, then git actually lets you set your very own pattern
for those things.
In fact, you can even do it on a per-file basis based on things like
filename rules (ie you can have different patterns for what to trigger on
for a *.c file and for a *.S file, since in a *.S file the 'name:' thing
_is_ the right pattern).
So not only are you making idiotic changes just for irrelevant tool usage,
you're also apparently lying about people "refusing to fix" things as an
excuse.
You can play with it. It's documented in gitattributes (see "Defining a
custom hunk header"), and the default one is just the same one that GNU
diff uses for "-p". I think.
You can add something like this to your ~/.gitconfig:
[diff "default"]
funcname=^[a-zA-Z_$].*(.*$
to only trigger the funcname pattern on a line that starts with a valid C
identifier hing, and contains a '('.
And you can just override the default like the above (that way you don't
have to specify attributes), but if you want to do things differently for
*.c files than from *.S files, you can edit your .git/info/attributes file
and make it contain something like
*.S diff=assembler
*.c diff=C
and now you can make your ~/.gitconfig actually show them differently, ie
something like
[diff "C"]
funcname=^[a-zA-Z_$].*(.*$
[diff "assembler"]
funcname=^[a-zA-Z_$].*:
etc.
Of course, there is a real cost to this, but it's cheap enough in practice
that you'll never notice.
Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
