On 09/21/2012 11:28 AM, Jim Meyering wrote: > Bernhard Voelker wrote: >> I changed the patch set by this command (several of the expressions >> exemt strings like "i.e." from being suffixed by 2 blanks): > > Well, grammatically, "i.e." should almost always be followed by a comma: > i.e., "i.e.," ;-) > So, in general, those should be fixed, and thus they would not have > to be exempted in a syntax-check rule.
ah, okay. >> I'm a bit lost at this point :-( > I applied your sed script and looked at the differences. > In the 4th chunk, your sed substitution changes a *context* line. Yes, now I see that. > - if (!cell) /* Missing type column, or mount point etc. */ > + if (!cell) /* Missing type column, or mount point etc. */ > > > That might actually be required, but you have to be careful of the > chronology. I.e., farther down, it changed a line that is being deleted: > > -- if (!cell) /* Missing type column, or mount point etc. */ > +- if (!cell) /* Missing type column, or mount point etc. */ > > That is the problem. > In general, you don't want to do that, since then when > "git am" tries to remove that line, it'll find that it no longer > matches, due to the change. > > The general rule is to change only "diff" lines that are being added > (i.e., with the leading "+" in unified diff output) > However, when an added line (that you want to change) appears > in the context of a later diff, *then* you'll have to change > it in the context, too. Hmm, yes, that's clear. It seems that I have to apply one after another then. Thanks for the help! Have a nice day, Berny
