From: Jeff King <peff@peff.net>
To: "Björn Steinbrink" <B.Steinbrink@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: diff --check is stupid about blank lines
Date: Wed, 20 Aug 2008 13:28:25 -0400 [thread overview]
Message-ID: <20080820172825.GC27773@sigill.intra.peff.net> (raw)
In-Reply-To: <20080820140517.GA1304@atjola.homenet>
On Wed, Aug 20, 2008 at 04:05:17PM +0200, Björn Steinbrink wrote:
> diff --check triggers not only for blank lines at the end of the file,
> but also at the end of the changes. That seems broken to me, unless you
> really dislike empty lines.
Hmm, yes, that seems wrong. The problem seems to be the conditional at
diff.c:1622:
if ((data.ws_rule & WS_TRAILING_SPACE) &&
data.trailing_blanks_start) {
fprintf(o->file, "%s:%d: ends with blank lines.\n",
data.filename, data.trailing_blanks_start);
data.status = 1; /* report errors */
}
that should probably be "if we care about trailing space, and the last
thing we saw was a trailing blank, _and_ the last hunk adds to
end-of-file, then...". However, I'm not sure what is the best way to get
that information out of xdiff. Is there a "this hunk hits eof" signal
anywhere? Is there a definitive line count we could use to calculate
that it is in the chunk of final lines in the file?
-Peff
next prev parent reply other threads:[~2008-08-20 17:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-20 14:05 diff --check is stupid about blank lines Björn Steinbrink
2008-08-20 17:28 ` Jeff King [this message]
2008-08-20 18:13 ` Junio C Hamano
2008-08-20 18:42 ` Junio C Hamano
2008-08-20 20:02 ` Björn Steinbrink
2008-08-20 22:20 ` Jeff King
2008-08-20 22:39 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080820172825.GC27773@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=B.Steinbrink@gmx.de \
--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.
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 NNTP newsgroup(s).