From ddd24c009fa12fe37c5a0ae58c79c6436f82a72d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Tue, 27 May 2014 17:51:23 +0200
Subject: [PATCH] factor out add_reviewers

Change-Id: I4d210bd3c896bb5d1cb13b4d38a08bfb317f4150
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
---
 bin/git-gpush | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/bin/git-gpush b/bin/git-gpush
index 5f6c9e2..0262220 100755
--- a/bin/git-gpush
+++ b/bin/git-gpush
@@ -199,6 +199,17 @@ sub lookup_alias($)
     return $user;
 }
 
+sub add_reviewers()
+{
+    if (@reviewers || @CCs) {
+        my @dudes = ();
+        push @dudes, "--receive-pack=git receive-pack";
+        push @dudes, map { " --reviewer=$_" } @reviewers;
+        push @dudes, map { " --cc=$_" } @CCs;
+        push @arguments, join('', @dudes); # Single argument to git push
+    }
+}
+
 sub push_patches()
 {
     # Detect tracking branch if ref-to is not set
@@ -224,16 +235,8 @@ sub push_patches()
         $ref_to = "refs/for/".$ref_to;
     }
 
-    my @dudes = ();
-    if (@reviewers || @CCs) {
-        push @dudes, "--receive-pack=git receive-pack";
-        push @dudes, map { " --reviewer=$_" } @reviewers;
-        push @dudes, map { " --cc=$_" } @CCs;
-    }
-
     my @gitcmd = ("git", "push");
     push @gitcmd, @arguments;
-    push @gitcmd, join('', @dudes) if (scalar @dudes); # Single argument to git push
     push @gitcmd, $remote, "$ref_from:$ref_to";
 
     print '+'.join(',', @gitcmd)."\n" if ($verbose);
@@ -242,4 +245,5 @@ sub push_patches()
 
 load_aliases();
 parse_arguments(@ARGV);
+add_reviewers();
 push_patches();
-- 
GitLab