From 150fc9c8458281fd281da37728515afb4640a650 Mon Sep 17 00:00:00 2001 From: Konstantin Kharlamov Date: Thu, 23 Sep 2021 23:25:41 +0200 Subject: [PATCH] Do not count git markers as "deleted lines" * lisp/vc/diff-mode.el (diff-fixup-modifs): Skip "end of patch" markers that `git-format-patch` leaves around (bug#50761). --- lisp/vc/diff-mode.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 0852f8790e9..057ffcd06e3 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1355,7 +1355,11 @@ else cover the whole buffer." (pcase (char-after) (?\s (cl-incf space)) (?+ (cl-incf plus)) - (?- (cl-incf minus)) + (?- (unless ;; In git format-patch "^-- $" signifies + ;; the end of the patch. + (and (eq diff-buffer-type 'git) + (looking-at "^-- $")) + (cl-incf minus))) (?! (cl-incf bang)) ((or ?\\ ?#) nil) (?\n (if diff-valid-unified-empty-line -- 2.39.2