From: Christoph Mallon <christoph.mallon@gmx.de>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git diff --check always shows line 1 for blank at EOF for new files
Date: Thu, 07 Oct 2010 14:33:05 +0200 [thread overview]
Message-ID: <4CADBE01.4000901@gmx.de> (raw)
In-Reply-To: <20101007093258.GA10941@burratino>
[-- Attachment #1: Type: text/plain, Size: 490 bytes --]
On 07.10.2010 11:32, Jonathan Nieder wrote:
> Try this:
>
> git init test
> cd test
> printf 'a\nb\nc\n'> file
> git add -A
> echo hello>> file
> echo>> file
> git diff --check
>
> As you can see, it still returns line 4, which is the beginning of the
> hunk that adds the blank line.
>
> A change to make it print the line number of the blank line itself
> does not sound so bad, though.
You're right. I think, the attached patch corrects the issue.
[-- Attachment #2: 0001-When-git-diff-check-detects-a-blank-line-at-EOF-show.patch --]
[-- Type: text/plain, Size: 818 bytes --]
>From 45eaa882dae35f2976e77cf0b6b06be78283c13f Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Thu, 7 Oct 2010 14:22:02 +0200
Subject: [PATCH] When git diff --check detects a blank line at EOF, show the line number of the empty line, not the line number of the beginning of the hunk.
---
diff.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/diff.c b/diff.c
index 71efa8e..452fdf4 100644
--- a/diff.c
+++ b/diff.c
@@ -2153,7 +2153,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
ecbdata.ws_rule = data.ws_rule;
check_blank_at_eof(&mf1, &mf2, &ecbdata);
- blank_at_eof = ecbdata.blank_at_eof_in_preimage;
+ blank_at_eof = ecbdata.blank_at_eof_in_postimage;
if (blank_at_eof) {
static char *err;
--
1.7.3
next prev parent reply other threads:[~2010-10-07 12:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-06 9:27 git diff --check always shows line 1 for blank at EOF for new files Christoph Mallon
2010-10-07 9:32 ` Jonathan Nieder
2010-10-07 12:33 ` Christoph Mallon [this message]
2010-10-10 10:46 ` 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=4CADBE01.4000901@gmx.de \
--to=christoph.mallon@gmx.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.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).