Reuben Thomas wrote: > On 26 January 2011 17:53, Jim Meyering <[email protected]> wrote: >> >>> One comment about the documentation: grep.texi has different >>> sectioning for the flags from grep --help; perhaps this should be >>> fixed? >> >> If you think one is obviously better than the other, >> please explain why along with a patch to improve things. > > I don't have an opinion on which is better, just that they should be > consistent.
Try to justify one position or the other, then. >> I applied your patch and got a warning from git am about trailing spaces. > > I have now set up whitespace-mode to know about grep (other GNU > projects seem to use tabs), so should avoid that in future. > >> An attempt to build (configure with --enable-gcc-warnings) failed > > Thanks for that tip, I was wondering why I wasn't getting warnings. > >> I've attached the incremental, followed by full format-patch output, >> with that merged in. Please apply that to a clean check-out >> (via git am) > > Apologies in advance if I've done something dumb, but I can't get this > to work. I saved your email, removed the top so I had just the full Perhaps your editor modified the patch? I confirmed that it worked for me. The patch I applied started with this line: >From 331804557bcbe8fc7a96b4bd256b4bfb901930fb Mon Sep 17 00:00:00 2001 ended with two blank lines after "1.7.3.5.38.gb312b", and had this SHA1 checksum: 28dae21b72ec56ee78be0d209c2b6007329df0dd > format-patch patch (otherwise, git am complained about non-existent > files such as zio.c, which made sense since I was applying the patch > to a clean checkout), and then I ran git am, and got: > > Applying: grep: add --decompress flag for transparent decompression > error: patch failed: tests/Makefile.am:104 > error: tests/Makefile.am: patch does not apply I suspect mangling by your editor or mail client. Your patch included a change there that converted 8 spaces to a TAB. > This appears to be a whitespace issue and nothing to do with the patch > proper. If I simply remove that section of the patch, it does apply. Removing that hunk is fine. I nearly removed that one, myself, but could see how an overzealous editor would want to convert 8 spaces at the beginning of a Makefile.am to a TAB... It might not realize that in an assignment the leading TAB is not required.
