From cd344a46cdf1f0854ab1a32d62d2423e2247e360 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 23 Mar 2016 11:20:45 +0100 Subject: [PATCH] Update scripts with new branch names again --- build/git-hooks/runHooks.php | 2 +- newznab/utility/Git.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/git-hooks/runHooks.php b/build/git-hooks/runHooks.php index c9310f2c1..ea59eb128 100755 --- a/build/git-hooks/runHooks.php +++ b/build/git-hooks/runHooks.php @@ -58,7 +58,7 @@ if ($error === false) { } } } else { - echo "not 'dev', '0.6.x-dev', '0.6.0' or '0.5.x' branch, skipping version/patch updates\n"; + echo "not 'dev', '0.x', or '0.5.x' branch, skipping version/patch updates\n"; } } else { echo "Error in pre-commit hooks!!\n"; diff --git a/newznab/utility/Git.php b/newznab/utility/Git.php index 7f6a1b8d0..04a181c00 100644 --- a/newznab/utility/Git.php +++ b/newznab/utility/Git.php @@ -27,7 +27,7 @@ namespace newznab\utility; class Git extends \GitRepo { private $branch; - private $mainBranches = ['dev','0.6.x-dev', '0.5.x', '0.x']; + private $mainBranches = ['dev', '0.5.x', '0.x']; public function __construct(array $options = []) {