From: Jakub Narebski <jnareb@gmail.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCHv2 1/2] git-patch-id: test for "no newline" markers
Date: Thu, 17 Feb 2011 03:55:46 -0800 (PST) [thread overview]
Message-ID: <m3ei7698qf.fsf@localhost.localdomain> (raw)
In-Reply-To: <d27aa07556df763b34b980d3706320216094d592.1297928549.git.git@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> writes:
> Currently, patch-id trips over our very own diff extension for marking
> the absence of newline at EOF.
This is not *our* diff extension; it is either GNU diff extension, or
it is defined in diff/patch format standard.
diff.info states in chapter "Incomplete Lines":
When an input file ends in a non-newline character, its last line is
called an "incomplete line" because its last character is not a
newline. All other lines are called "full lines" and end in a newline
character. Incomplete lines do not match full lines unless differences
in white space are ignored (*note White Space::).
An incomplete line is normally distinguished on output from a full
line by a following line that starts with `\'. [...]
For example, suppose `F' and `G' are one-byte files that contain
just `f' and `g', respectively. Then `diff F G' outputs
1c1
< f
\ No newline at end of file
---
> g
\ No newline at end of file
(The exact message may differ in non-English locales.)
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2011-02-17 11:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 14:56 Why does git-patch-id(1) sometimes print two lines, one of which has commit = 0000000000000000000000000000000000000000 Ævar Arnfjörð Bjarmason
2011-02-16 16:11 ` Michael J Gruber
2011-02-16 16:55 ` [PATCH 1/2] git-patch-id: test for "no newline" markers Michael J Gruber
2011-02-16 16:55 ` [PATCH 2/2] git-patch-id: do not trip over " Michael J Gruber
2011-02-16 20:05 ` Junio C Hamano
2011-02-17 7:44 ` [PATCHv2 1/2] git-patch-id: test for " Michael J Gruber
2011-02-17 7:44 ` [PATCHv2 2/2] git-patch-id: do not trip over " Michael J Gruber
2011-02-18 4:16 ` Jeff King
2011-02-18 8:02 ` Michael J Gruber
2011-02-18 10:12 ` [PATCHv3 1/2] git-patch-id: test for " Michael J Gruber
2011-02-18 10:12 ` [PATCHv3 2/2] git-patch-id: do not trip over " Michael J Gruber
2011-02-18 10:41 ` Jeff King
2011-02-18 10:43 ` Michael J Gruber
2011-02-18 10:47 ` Jeff King
2011-02-18 14:29 ` Jakub Narebski
2011-02-18 10:40 ` [PATCHv2 " Jeff King
2011-02-17 11:55 ` Jakub Narebski [this message]
2011-02-17 12:11 ` [PATCHv2 1/2] git-patch-id: test for " Michael J Gruber
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=m3ei7698qf.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=avarab@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).