branch: elpa/magit
commit 04ee97278bc3e2cd7b46440baec91ec0ab0394bb
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit:--gpg-sign: Set default level via prototype
---
lisp/magit-merge.el | 2 +-
lisp/magit-sequence.el | 8 ++++----
lisp/magit.el | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index eef1e666eab..779bda5fe90 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -47,7 +47,7 @@
(5 "-b" "Ignore changes in amount of whitespace" "-Xignore-space-change")
(5 "-w" "Ignore whitespace when comparing lines" "-Xignore-all-space")
(5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=")
- (5 magit:--gpg-sign)
+ (magit:--gpg-sign)
(magit:--signoff)]
["Actions"
:if-not magit-merge-in-progress-p
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 55b599fe0aa..da7914eace4 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -144,7 +144,7 @@ This discards all changes made since the sequence started."
("-F" "Attempt fast-forward" "--ff")
("-x" "Reference cherry in commit message" "-x")
("-e" "Edit commit messages" ("-e" "--edit"))
- (5 magit:--gpg-sign)
+ (magit:--gpg-sign)
(magit:--signoff)]
[:if-not magit-sequencer-in-progress-p
["Apply here"
@@ -378,7 +378,7 @@ the process manually."
("-e" "Edit commit message" ("-e" "--edit"))
("-E" "Don't edit commit message" "--no-edit")
("=s" magit-merge:--strategy)
- (5 magit:--gpg-sign)
+ (magit:--gpg-sign)
(magit:--signoff)]
["Actions"
:if-not magit-sequencer-in-progress-p
@@ -440,7 +440,7 @@ without prompting."
("-d" "Use author date as committer date" "--committer-date-is-author-date")
("-t" "Use current time as author date" "--ignore-date")
("-s" "Add Signed-off-by lines" ("-s" "--signoff"))
- (5 magit:--gpg-sign)
+ (magit:--gpg-sign)
(magit:--signoff)]
["Apply"
:if-not magit-am-in-progress-p
@@ -545,7 +545,7 @@ This discards all changes made since the sequence started."
("-i" "Interactive" ("-i" "--interactive"))
("-h" "Disable hooks" "--no-verify")
(7 magit-rebase:--exec)
- (5 magit:--gpg-sign)
+ (magit:--gpg-sign)
(magit:--signoff)]
[:if-not magit-rebase-in-progress-p
:description (lambda ()
diff --git a/lisp/magit.el b/lisp/magit.el
index 2c23992d011..34b6f60515a 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -514,7 +514,8 @@ is run in the top-level directory of the current working
tree."
:shortarg "-S"
:argument "--gpg-sign="
:allow-empty t
- :reader #'magit-read-gpg-signing-key)
+ :reader #'magit-read-gpg-signing-key
+ :level 5)
(defvar magit-gpg-secret-key-hist nil)
