From: Stefan Kangas <stefan@marxist.se>
To: Dmitriy Blinov <bda@mns.spb.ru>
Cc: 1537@debbugs.gnu.org, 1536@debbugs.gnu.org
Subject: bug#1536: bug#1537: diff-mode for git patches trouble
Date: Sun, 16 Aug 2020 10:00:02 -0700 [thread overview]
Message-ID: <CADwFkmmqmqU5W2_KXEwJy4TCnvEq04ruNUsByCPdoB68wE4ZpQ@mail.gmail.com> (raw)
In-Reply-To: <494110EB.3040600@mns.spb.ru> (Dmitriy Blinov's message of "Thu, 11 Dec 2008 16:08:59 +0300")
Dmitriy Blinov <bda@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
next prev parent reply other threads:[~2020-08-16 17:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 13:08 bug#1537: diff-mode for git patches trouble Dmitriy Blinov
2008-12-11 19:04 ` Stefan Monnier
2008-12-12 6:57 ` Dmitriy Blinov
2008-12-12 19:08 ` Stefan Monnier
2008-12-12 19:15 ` Processed: " Emacs bug Tracking System
2020-08-16 17:00 ` Stefan Kangas [this message]
2020-10-14 6:08 ` bug#1537: bug#1536: " Lars Ingebrigtsen
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=CADwFkmmqmqU5W2_KXEwJy4TCnvEq04ruNUsByCPdoB68wE4ZpQ@mail.gmail.com \
--to=stefan@marxist.se \
--cc=1536@debbugs.gnu.org \
--cc=1537@debbugs.gnu.org \
--cc=bda@mns.spb.ru \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.