Re: [PATCH] Per-path attribute based hunk header selection.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> writes:

> In .gitattributes:
>
> 	*.java diff=java
> 	*.perl diff=perl
> 	*.doc diff=doc
>
> In .git/config
>
> 	[diff "java"]
> 		command = internal
> 		funcname = ... # ugly and complicated regexp to override the built-in one.
>
> 	[diff "perl"]
> 		command = internal
> 		funcname = ...
>
> 	[diff "doc"]
> 		command = ms-doc-diff
>
> Doesn't this make more sense and mesh much better with the already 
> existing custom diff driver?
>
> (And yeah, maybe we could instead of "command=internal" just have the rule 
> that "internal" is the default, and you'd not have a command at all when 
> you want to run the internal diff.
>
> Just an idea. I don't have any code.

Yeah, I'd be lying if I said that this did not cross my mind
when I saw existing diff.*.command handling.

About the comment from Johannes regarding hunk_header vs
funcname, I would actually prefer hunk_header, since that is
what this is about ("funcname" and "find_func" were misnomer
from the beginning), but I'd rename hunk_header to funcname for
the sake of consistency and minimizing the diff.

Will find time to look at this over the weekend.


-
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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux