GNU bug report logs - #1537
diff-mode for git patches trouble

Previous Next

Full log

Message #37 received at 1537 <at> debbugs.gnu.org (full text, mbox):

From: Stefan Kangas <stefan <at> marxist.se>
To: Dmitriy Blinov <bda <at> mns.spb.ru>
Cc: 1537 <at> debbugs.gnu.org, 1536 <at> debbugs.gnu.org
Subject: Re: bug#1537: diff-mode for git patches trouble
Date: Sun, 16 Aug 2020 10:00:02 -0700

Dmitriy Blinov <bda <at> mns.spb.ru> writes:

> There is the problem then I'm trying to edit git-generated patches in
> emacs diff-mode.
>
> git patches look like:
> ---
> hello.txt |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hello.txt b/hello.txt
> index 55bf894..25a09cc 100644
> --- a/hello.txt
> +++ b/hello.txt
> @@ -6,7 +6,7 @@
> 5
> 6
> 7
> -8
> +8 8
> 9
> 10
> 11

(That was 11 years ago.)

I can't reproduce this on current master.  The numbers seem to update
correctly, as ar as I'm understanding from:

    https://stackoverflow.com/questions/6508651/what-do-the-numbers-on-a-git-diff-header-mean

It would be useful if someone could double check this finding in case
there is something I'm missing.  It could be quickly verified using:

    git format-patch -1 ; ./src/emacs -Q *patch

And then edit any line in a patch to see if the numbers update correctly.

Best regards,
Stefan Kangas

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.