Fixing Merge.upstream

winton · May 29, 2010 · 4570b01 · 4570b01
1 parent 6b54b20
commit 4570b01
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/lib/stencil/merge.rb b/lib/stencil/merge.rb
@@ -36,11 +36,10 @@ def template(path, push)
         Cmd.run path, "git checkout master"
       end
 
-      def upstream(name, commit=nil, branches=[])
+      def upstream(name, commit=nil, *branches)
         # Project variables
         project = Config.read[:projects][name]
-        branch = Cmd.run(project[:path], "git branch").split
+        branches = project[:branches] if branches.empty?
-        branch = branch[branch.index('*') + 1]
 
         # Template variables
         template = Config.read[:templates][project[:template].intern]
@@ -58,9 +57,6 @@ def upstream(name, commit=nil, branches=[])
           commit = Cmd.run(template[:path], cmd).strip
         end
 
-        # Cherry pick into master if no branches specified
-        branches = %w(master) if branches.empty?
-
         # Cherry pick commit into branches
         branches.each do |branch|
           output = Cmd.run path, "git checkout #{branch}"