branch: elpa/magit
commit bfffb49218ca3acc28f077acecda335816a4db00
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit:--signoff: Set default level via prototype
---
lisp/magit-commit.el | 2 +-
lisp/magit-merge.el | 2 +-
lisp/magit-sequence.el | 8 ++++----
lisp/magit.el | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index c26885d69d6..b796298cc34 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -129,7 +129,7 @@ Also see https://github.com/magit/magit/issues/4132.";
(magit:--author :description "Override the author")
(magit-commit:--date :level 7)
(magit:--gpg-sign :level 5)
- (magit:--signoff :level 6)
+ (magit:--signoff)
(magit-commit:--reuse-message)]
[["Create"
("c" "Commit" magit-commit-create)]
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index 30d5d8a38d4..eef1e666eab 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -48,7 +48,7 @@
(5 "-w" "Ignore whitespace when comparing lines" "-Xignore-all-space")
(5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=")
(5 magit:--gpg-sign)
- (6 magit:--signoff)]
+ (magit:--signoff)]
["Actions"
:if-not magit-merge-in-progress-p
[("m" "Merge" magit-merge-plain)
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index a1ff3e832ad..55b599fe0aa 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -145,7 +145,7 @@ This discards all changes made since the sequence started."
("-x" "Reference cherry in commit message" "-x")
("-e" "Edit commit messages" ("-e" "--edit"))
(5 magit:--gpg-sign)
- (6 magit:--signoff)]
+ (magit:--signoff)]
[:if-not magit-sequencer-in-progress-p
["Apply here"
("A" "Pick" magit-cherry-copy)
@@ -379,7 +379,7 @@ the process manually."
("-E" "Don't edit commit message" "--no-edit")
("=s" magit-merge:--strategy)
(5 magit:--gpg-sign)
- (6 magit:--signoff)]
+ (magit:--signoff)]
["Actions"
:if-not magit-sequencer-in-progress-p
("V" "Revert commit(s)" magit-revert-and-commit)
@@ -441,7 +441,7 @@ without prompting."
("-t" "Use current time as author date" "--ignore-date")
("-s" "Add Signed-off-by lines" ("-s" "--signoff"))
(5 magit:--gpg-sign)
- (6 magit:--signoff)]
+ (magit:--signoff)]
["Apply"
:if-not magit-am-in-progress-p
("m" "maildir" magit-am-apply-maildir)
@@ -546,7 +546,7 @@ This discards all changes made since the sequence started."
("-h" "Disable hooks" "--no-verify")
(7 magit-rebase:--exec)
(5 magit:--gpg-sign)
- (6 magit:--signoff)]
+ (magit:--signoff)]
[:if-not magit-rebase-in-progress-p
:description (lambda ()
(format (propertize "Rebase %s onto" 'face
'transient-heading)
diff --git a/lisp/magit.el b/lisp/magit.el
index cb685466f7f..2c23992d011 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -505,7 +505,8 @@ is run in the top-level directory of the current working
tree."
:description "Add Signed-off-by trailer"
:class 'transient-switch
:shortarg "-s"
- :argument "--signoff")
+ :argument "--signoff"
+ :level 6)
(transient-define-argument magit:--gpg-sign ()
:description "Sign using gpg"
