motiejus
/
jgit
1
Fork 0
Code Releases Activity

CommitCommand: call GpgSigner.getDefault() only if indeed signing 

If we're not signing the commit, we don't need the GpgSigner at all.

Change-Id: Ica35651c73d82b7604c8a67487b0d9474c908aae
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
This commit is contained in:
Thomas Wolf 2022-04-03 20:33:37 +02:00
parent fbce3122e0
commit 7e06e51750
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
View File

@ -323,8 +323,14 @@ private void checkIfEmpty(RevWalk rw, ObjectId headId, ObjectId indexTreeId)
private void sign(CommitBuilder commit) throws ServiceUnavailableException,
CanceledException, UnsupportedSigningFormatException {
if (gpgSigner == null) {
throw new ServiceUnavailableException(
JGitText.get().signingServiceUnavailable);
gpgSigner = GpgSigner.getDefault();
if (gpgSigner == null) {
throw new ServiceUnavailableException(
JGitText.get().signingServiceUnavailable);
}
}
if (signingKey == null) {
signingKey = gpgConfig.getSigningKey();
}
if (gpgSigner instanceof GpgObjectSigner) {
((GpgObjectSigner) gpgSigner).signObject(commit,
@ -659,12 +665,6 @@ private void processOptions(RepositoryState state, RevWalk rw)
signCommit = gpgConfig.isSignCommits() ? Boolean.TRUE
: Boolean.FALSE;
}
if (signingKey == null) {
signingKey = gpgConfig.getSigningKey();
}
if (gpgSigner == null) {
gpgSigner = GpgSigner.getDefault();
}
}
private boolean isMergeDuringRebase(RepositoryState state) {