GNU bug report logs - #77014
[PATCH] ; Fix 'diff-mode' tests

Previous Next

Package: emacs;

Reported by: jm <at> pub.pink

Date: Fri, 14 Mar 2025 16:08:02 UTC

Severity: normal

Tags: patch

Done: Stefan Kangas <stefankangas <at> gmail.com>

To reply to this bug, email your comments to 77014 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to bug-gnu-emacs <at> gnu.org:
bug#77014; Package emacs. (Fri, 14 Mar 2025 16:08:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to jm <at> pub.pink:
New bug report received and forwarded. Copy sent to bug-gnu-emacs <at> gnu.org. (Fri, 14 Mar 2025 16:08:02 GMT) Full text and rfc822 format available.

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

From: jm <at> pub.pink
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] ; Fix 'diff-mode' tests
Date: Fri, 14 Mar 2025 11:07:32 -0500

[Message part 1 (text/plain, inline)]
Tags: patch

For some reason f2f1fb7fe00 (or a commit contained therein)
removed a space character from:

  test/lisp/vc/diff-mode-resources/git.patch

which makes the diff-mode tests fail.


[0001-Fix-diff-mode-tests.patch (text/patch, attachment)]
Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#77014; Package emacs. (Fri, 14 Mar 2025 16:52:02 GMT) Full text and rfc822 format available.

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

From: Eli Zaretskii <eliz <at> gnu.org>
To: jm <at> pub.pink
Cc: 77014 <at> debbugs.gnu.org
Subject: Re: bug#77014: [PATCH] ; Fix 'diff-mode' tests
Date: Fri, 14 Mar 2025 18:51:14 +0200

> From: jm <at> pub.pink
> Date: Fri, 14 Mar 2025 11:07:32 -0500
> 
> For some reason f2f1fb7fe00 (or a commit contained therein)
> removed a space character from:
> 
>   test/lisp/vc/diff-mode-resources/git.patch

Probably due to the oh-so-helpful git-commit-hooks, which reject
trailing whitespace.
Information forwarded to bug-gnu-emacs <at> gnu.org:
bug#77014; Package emacs. (Fri, 14 Mar 2025 16:58:02 GMT) Full text and rfc822 format available.

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

From: john muhl <jm <at> pub.pink>
To: Eli Zaretskii <eliz <at> gnu.org>
Cc: 77014 <at> debbugs.gnu.org
Subject: Re: bug#77014: [PATCH] ; Fix 'diff-mode' tests
Date: Fri, 14 Mar 2025 11:53:33 -0500

Eli Zaretskii <eliz <at> gnu.org> writes:

>> From: jm <at> pub.pink
>> Date: Fri, 14 Mar 2025 11:07:32 -0500
>> 
>> For some reason f2f1fb7fe00 (or a commit contained therein)
>> removed a space character from:
>> 
>>   test/lisp/vc/diff-mode-resources/git.patch
>
> Probably due to the oh-so-helpful git-commit-hooks, which reject
> trailing whitespace.

Of course. That explains why I had to go behind their back to make
the patch. Maybe something in the merge script triggered it as I
still can’t find anything in those commits that touched that file.
Reply sent to Stefan Kangas <stefankangas <at> gmail.com>:
You have taken responsibility. (Fri, 14 Mar 2025 19:00:03 GMT) Full text and rfc822 format available.
Notification sent to jm <at> pub.pink:
bug acknowledged by developer. (Fri, 14 Mar 2025 19:00:03 GMT) Full text and rfc822 format available.

Message #16 received at 77014-done <at> debbugs.gnu.org (full text, mbox):

From: Stefan Kangas <stefankangas <at> gmail.com>
To: jm <at> pub.pink, 77014-done <at> debbugs.gnu.org
Subject: Re: bug#77014: [PATCH] ; Fix 'diff-mode' tests
Date: Fri, 14 Mar 2025 11:59:28 -0700

jm <at> pub.pink writes:

> For some reason f2f1fb7fe00 (or a commit contained therein)
> removed a space character from:
>
>   test/lisp/vc/diff-mode-resources/git.patch
>
> which makes the diff-mode tests fail.

Thanks, installed on master as [1: af5a75a0bdd].

[1: af5a75a0bdd] 2025-03-14
  ; Fix 'diff-mode' tests (Bug#77014)
  https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=af5a75a0bdd891686c67648bc0fa09ffb7e3ed0d
This bug report was last modified 21 days ago.

Previous Next

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