Merge branch 'master-1.3.x'

Conflicts:
	Source/MantisSourceBase.class.php

Author: dregad

Source/MantisSourceBase.class.php

@@ -17,7 +17,7 @@ abstract class MantisSourceBase extends MantisPlugin
 	 *
 	 * Numbering follows Semantic Versioning. Major version increments indicate
 	 * a change in the minimum required MantisBT version: 0=1.2; 1=1.3, 2=2.x.
-	 * The framework version is incremented when the plugin's core file change.
+	 * The framework version is incremented when the plugin's core files change.
 	 */
 	const FRAMEWORK_VERSION = '2.0.0';
 

Source/MantisSourceGitBasePlugin.class.php

@@ -18,17 +18,14 @@ abstract class MantisSourceGitBasePlugin extends MantisSourcePlugin
 	 * Git branch name validation regex.
 	 * Based on rules defined in man page
 	 * http://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.html
+	 * - Must not start with '/'; cannot contain '/.', '//', '@{' or '\';
+	 *   cannot be a single '@': `^(?!/|.*([/.]\.|//|@\{|\\\\)|@$)`
+	 * - One or more chars, except the following: ASCII control, space,
+	 *   tilde, caret, colon, question mark, asterisk, open bracket:
+	 *   `[^\000-\037\177 ~^:?*[]+`
+	 * - Must not end with '.lock', '/' or '.': `(?<!\.lock|[/.])$`
 	 */
-	private $valid_branch_regex = '%'
-		# Must not start with '/'; cannot contain '/.', '//', '@{' or '\';
-		# cannot be a single '@'.
-		. '^(?!/|.*([/.]\.|//|@\{|\\\\)|@$)'
-		# One or more chars, except the following: ASCII control, space,
-		# tilde, caret, colon, question mark, asterisk, open bracket.
-		. '[^\000-\037\177 ~^:?*[]+'
-		# Must not end with '.lock', '/' or '.'
-		. '(?<!\.lock|[/.])$'
-		. '%';
+	private $valid_branch_regex = '%^(?!/|.*([/.]\.|//|@\{|\\\\)|@$)[^\000-\037\177 ~^:?*[]+(?<!\.lock|[/.])$%';
 
 	/**
 	 * Error constants

tools/bump-version.php

@@ -146,10 +146,13 @@ function bump_version_and_commit( $p_version, &$p_framework_version ) {
 	}
 
 	// Generate commit message
-	$t_message = "Bump version to $t_new_version\n\n";
-	$t_message .= "VCS plugins changes:\n";
-	foreach( get_changed_plugins() as $t_plugin ) {
-		$t_message .= "- $t_plugin " . $g_plugins[$t_plugin] . "\n";
+	$t_message = "Bump version to $t_new_version";
+	$t_changed_plugins = get_changed_plugins();
+	if( $t_changed_plugins ) {
+		$t_message .= "\n\nVCS plugins changes:\n";
+		foreach( $t_changed_plugins as $t_plugin ) {
+			$t_message .= "- $t_plugin " . $g_plugins[$t_plugin] . "\n";
+		}
 	}
 
 	// Commit