Merge pull request #676 from oanhnn/fix-issue-675

Fix issue 675
deployphp · Jun 15, 2016 · de13478 · de13478
2 parents 041ae4a + 5457575
commit de13478
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/recipe/common.php b/recipe/common.php
@@ -177,17 +177,22 @@
     $gitCache = env('git_cache');
     $depth = $gitCache ? '' : '--depth 1';
 
+    $at = '';
+    if (!empty($branch)) {
+        $at = "-b $branch";
+    }
+
+    // If option `tag` is set
     if (input()->hasOption('tag')) {
         $tag = input()->getOption('tag');
-    } elseif (input()->hasOption('revision')) {
-        $revision = input()->getOption('revision');
+        if (!empty($tag)) {
+            $at = "-b $tag";
+        }
     }
 
-    $at = '';
-    if (!empty($tag)) {
-        $at = "-b $tag";
-    } elseif (!empty($branch)) {
-        $at = "-b $branch";
+    // If option `tag` is not set and option `revision` is set
+    if (empty($tag) && input()->hasOption('revision')) {
+        $revision = input()->getOption('revision');
     }
 
     $releases = env('releases_list');