enhance mergeCommandBuilder API with setMessage to avoid templating commit messages

This commit is contained in:
Eduard Heimbuch
2020-09-25 10:30:45 +02:00
parent f0db57faed
commit a39abcdbe9
3 changed files with 29 additions and 4 deletions

View File

@@ -181,6 +181,18 @@ public class MergeCommandBuilder {
return this;
}
/**
* Use this to set the commit message. If no message is set, the message template will be used.
*
* This is optional and for {@link #executeMerge()} only.
*
* @return This builder instance.
*/
public MergeCommandBuilder setMessage(String message) {
request.setMessage(message);
return this;
}
/**
* Use this to reset the command.
* @return This builder instance.

View File

@@ -42,6 +42,7 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
private String targetBranch;
private Person author;
private String messageTemplate;
private String message;
private MergeStrategy mergeStrategy;
private boolean sign = true;
@@ -77,6 +78,14 @@ public class MergeCommandRequest implements Validateable, Resetable, Serializabl
this.messageTemplate = messageTemplate;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public MergeStrategy getMergeStrategy() {
return mergeStrategy;
}