Re: [PATCH] * .gitattributes: Better diff output for texinfo sources.

[Eric Blake]

Jim Meyering <jim <at> meyering.net> writes:

> 
> FYI, git diff didn't produce the "funcname" style string
> on each @@ line that I've come to expect in diffs of other
> languages like C and ruby.  With this .gitattributes file
> and following the advice in the comment, now it does:

Thanks for the tip.

> +*.texi diff=texinfo

I would make thie *.texi* (making it easier to copy into projects that use 
*.texinfo, like m4).

> +
> +# Put something like the following e.g., in your ~/.gitconfig file
> +# # Include proper "function name" string in diffs of texinfo.
> +# # Derived from the regexp in emacs' lisp/add-log.el.
> +# [diff "texinfo"]
> +#         funcname = "address@hidden \t]\\+\\([^,]\\+\\)"

GNU specific.  For this to work on cygwin, I had to stick with POSIX BRE:

funcname = "address@hidden \t][ \t]*\\([^,][^,]*\\)"

The m4 ./bootstrap script now goes so far as to try adding this setting (and 
merge.gnu-merge-changelog.*) in .git/config as part of setting up the fresh 
checkout; maybe you'd like to do the same in coreutils?

-- 
Eric Blake