Commit 5502e37e authored by Jonathan Doklovic's avatar Jonathan Doklovic

Merge branch 'release/1.0-alpha21.1'

parents beac34a0 f6a332d7
......@@ -10,4 +10,6 @@ For more information and usage guide, [see the wiki](https://bitbucket.org/atlas
For discussion about the plugin, [see the google group](https://groups.google.com/forum/#!forum/maven-jgitflow-users)
To log an issue or feature request, [use the issue tracker](https://bitbucket.org/atlassian/maven-jgitflow-plugin/issues)
\ No newline at end of file
To log an issue or feature request, [use the issue tracker](https://bitbucket.org/atlassian/maven-jgitflow-plugin/issues)
Got something to say? [@sysbliss](https://twitter.com/sysbliss) #MavenJGitFlow
\ No newline at end of file
......@@ -9,7 +9,7 @@
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-jgitflow-plugin</artifactId>
<version>1.0-alpha21</version>
<version>1.0-alpha21.1</version>
<packaging>maven-plugin</packaging>
......
......@@ -411,6 +411,11 @@ public class ReleaseContext
public String getScmCommentPrefix()
{
if(null == scmCommentPrefix || scmCommentPrefix.equalsIgnoreCase("null"))
{
this.scmCommentPrefix = "";
}
return scmCommentPrefix;
}
......
......@@ -111,7 +111,6 @@ public class DefaultFlowFeatureManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),prefixedBranchName,reporter))
{
reporter.errorText("feature-finish","local branch '" + prefixedBranchName + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + prefixedBranchName + "' is behind the remote branch");
}
......@@ -122,7 +121,6 @@ public class DefaultFlowFeatureManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),flow.getDevelopBranchName(),flow.getReporter()))
{
reporter.errorText("feature-finish","local branch '" + flow.getDevelopBranchName() + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + flow.getDevelopBranchName() + "' is behind the remote branch");
}
......
......@@ -219,7 +219,6 @@ public class DefaultFlowHotfixManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),prefixedBranchName,reporter))
{
reporter.errorText("hotfix-finish","local branch '" + prefixedBranchName + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + prefixedBranchName + "' is behind the remote branch");
}
......@@ -230,7 +229,6 @@ public class DefaultFlowHotfixManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),flow.getDevelopBranchName(),flow.getReporter()))
{
reporter.errorText("hotfix-finish","local branch '" + flow.getDevelopBranchName() + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + flow.getDevelopBranchName() + "' is behind the remote branch");
}
......@@ -241,7 +239,6 @@ public class DefaultFlowHotfixManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),flow.getMasterBranchName(),flow.getReporter()))
{
reporter.errorText("hotfix-finish","local branch '" + flow.getMasterBranchName() + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + flow.getMasterBranchName() + "' is behind the remote branch");
}
......
......@@ -209,7 +209,6 @@ public class DefaultFlowReleaseManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),prefixedBranchName,reporter))
{
reporter.errorText("release-finish","local branch '" + prefixedBranchName + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + prefixedBranchName + "' is behind the remote branch");
}
......@@ -220,7 +219,6 @@ public class DefaultFlowReleaseManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),flow.getDevelopBranchName(),flow.getReporter()))
{
reporter.errorText("release-finish","local branch '" + flow.getDevelopBranchName() + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + flow.getDevelopBranchName() + "' is behind the remote branch");
}
......@@ -231,7 +229,6 @@ public class DefaultFlowReleaseManager extends AbstractFlowReleaseManager
if(GitHelper.localBranchBehindRemote(flow.git(),flow.getMasterBranchName(),flow.getReporter()))
{
reporter.errorText("release-finish","local branch '" + flow.getMasterBranchName() + "' is behind the remote branch");
reporter.endMethod();
reporter.flush();
throw new BranchOutOfDateException("local branch '" + flow.getMasterBranchName() + "' is behind the remote branch");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment