From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 23 Oct 2024 02:57:40 +0000 (+0800)
Subject: ; vc-git-modify-change-comment: Restore ignoring --amend
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f12e40cc2efd50e34005722066778f9b54c3aca7;p=emacs.git

; vc-git-modify-change-comment: Restore ignoring --amend

This was accidentally lost when installing this new feature on
master.

(cherry picked from commit e756d4373bdf1b076ee284c46637855908dd10d7)
---

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index e039133ede5..899358339f3 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -1986,7 +1986,8 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
 
 (defun vc-git-modify-change-comment (files rev comment)
   (vc-git--assert-allowed-rewrite rev)
-  (let* ((args (vc-git--log-edit-extract-headers comment))
+  (let* ((args (delete "--amend"
+                       (vc-git--log-edit-extract-headers comment)))
          (message (format "amend! %s\n\n%s" rev (pop args)))
          (msg-file
           ;; On MS-Windows, pass the message through a file, to work