From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 06 Jun 2008 14:00:59 GMT
Subject: Re: [PATCH v3 1/2] Allow git-apply to ignore the hunk headers (AKA recountdiff)
Message-ID: <alpine.DEB.1.00.0806061500290.1783@racer>
In-Reply-To: <5d46db230806052218r67e79a46rd0150cd9fe2af970@mail.gmail.com>

Hi,

On Fri, 6 Jun 2008, Govind Salinas wrote:

> On Thu, Jun 5, 2008 at 6:06 PM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > +
> > +               switch (*line) {
> > +               case ' ': case '\n':
> > +                       fragment->newlines++;
> > +                       /* fall through */
> > +               case '-':
> > +                       fragment->oldlines++;
> > +                       break;
> > +               case '+':
> > +                       fragment->newlines++;
> > +                       if (line_nr == 0) {
> > +                               fragment->leading = 1;
> > +                               fragment->oldpos = 1;
> > +                       }
> > +                       fragment->trailing = 1;
> > +                       break;
> > +               case '@':
> > +                       return size < 3 || prefixcmp(line, "@@ ");
> > +               case 'd':
> > +                       return size < 5 || prefixcmp(line, "diff ");
> > +               default:
> > +                       return -1;
> > +               }
> > +               line_nr++;
> > +       }
> > +}
> 
> Perhaps this is accounted for and I did not see, but I believe that
> a backslash is used for the "no newline at end of file" line.  Does that
> need to be allowed here?

Will change.

Ciao,
Dscho