From: "Govind Salinas" <govind@sophiasuchtig.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3 1/2] Allow git-apply to ignore the hunk headers (AKA recountdiff)
Date: Fri, 6 Jun 2008 00:18:56 -0500 [thread overview]
Message-ID: <5d46db230806052218r67e79a46rd0150cd9fe2af970@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0806060006370.21190@racer>
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?
Thanks,
Govind.
next prev parent reply other threads:[~2008-06-06 5:20 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-05 10:16 [PATCH 1/2] Allow git-apply to fix up the line counts Johannes Schindelin
2008-06-05 10:17 ` [PATCH 2/2] git-add: introduce --edit (to edit the diff vs. the index) Johannes Schindelin
2008-06-05 11:24 ` [PATCH 1/2] Allow git-apply to fix up the line counts Johannes Sixt
2008-06-05 13:04 ` Johannes Schindelin
2008-06-05 13:36 ` Johannes Sixt
2008-06-05 13:47 ` Johannes Schindelin
2008-06-05 14:13 ` Johannes Sixt
2008-06-05 14:54 ` Johannes Schindelin
2008-06-05 15:07 ` Johannes Sixt
2008-06-05 16:19 ` [PATCH v2 0/2] git add --edit Johannes Schindelin
2008-06-05 16:20 ` [PATCH v2 1/2] Allow git-apply to ignore the hunk headers Johannes Schindelin
2008-06-05 21:16 ` Junio C Hamano
2008-06-05 22:39 ` Johannes Schindelin
2008-06-05 23:06 ` [PATCH v3 0/2] git add --edit Johannes Schindelin
2008-06-05 23:06 ` [PATCH v3 1/2] Allow git-apply to ignore the hunk headers (AKA recountdiff) Johannes Schindelin
2008-06-06 4:55 ` Junio C Hamano
2008-06-06 13:58 ` Johannes Schindelin
2008-06-06 15:34 ` Junio C Hamano
2008-06-06 16:13 ` Junio C Hamano
2008-06-06 16:37 ` Johannes Schindelin
2008-06-06 16:46 ` Junio C Hamano
2008-06-06 17:35 ` Johannes Schindelin
2008-06-06 5:18 ` Govind Salinas [this message]
2008-06-06 14:00 ` Johannes Schindelin
2008-06-05 23:07 ` [PATCH v3 2/2] git-add: introduce --edit (to edit the diff vs. the index) Johannes Schindelin
2008-06-06 10:02 ` Olivier Marin
2008-06-06 14:21 ` Johannes Schindelin
2008-06-06 4:55 ` [PATCH v3 0/2] git add --edit Junio C Hamano
2008-06-06 13:59 ` Johannes Schindelin
2008-06-05 23:22 ` [PATCH v2 1/2] Allow git-apply to ignore the hunk headers Junio C Hamano
2008-06-05 23:36 ` Johannes Schindelin
2008-06-06 7:02 ` Paolo Bonzini
2008-06-06 14:04 ` Johannes Schindelin
2008-06-06 10:33 ` Sergei Organov
2008-06-06 14:27 ` Johannes Schindelin
2008-06-06 15:14 ` Junio C Hamano
2008-06-05 16:20 ` [PATCH v2 2/2] git-add: introduce --edit (to edit the diff vs. the index) Johannes Schindelin
2008-06-05 18:12 ` Pieter de Bie
2008-06-05 18:39 ` [PATCH 1/2] Allow git-apply to fix up the line counts Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d46db230806052218r67e79a46rd0150cd9fe2af970@mail.gmail.com \
--to=govind@sophiasuchtig.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).