From 275c37f685504b3892a79a8f5d039ad4dafd50b3 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <ruud@chorus.one>
Date: Fri, 24 Jun 2022 18:31:43 +0200
Subject: Fix bug in TagReference.create

When passing the "message" kwarg, this would add a -m command-line flag
without removing --message, and the message would be duplicated. Avoid
that by deleting "message" from the command line.
---
 git/refs/tag.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'git/refs')

diff --git a/git/refs/tag.py b/git/refs/tag.py
index 0295b54d..d32d91bc 100644
--- a/git/refs/tag.py
+++ b/git/refs/tag.py
@@ -113,10 +113,12 @@ class TagReference(Reference):
         if "ref" in kwargs and kwargs["ref"]:
             reference = kwargs["ref"]
 
+        if "message" in kwargs and kwargs["message"]:
+            kwargs["m"] = kwargs["message"]
+            del kwargs["message"]
+
         if logmsg:
             kwargs["m"] = logmsg
-        elif "message" in kwargs and kwargs["message"]:
-            kwargs["m"] = kwargs["message"]
 
         if force:
             kwargs["f"] = True
-- 
cgit v1.2.1