From e81306e4d8cfb354aa16fa035adc1279c83ba4ca Mon Sep 17 00:00:00 2001
From: dreamcat4 <dreamcat4@gmail.com>
Date: Mon, 20 Apr 2009 13:26:28 +0100
Subject: [PATCH] Fix to update parameter <target> -> pull <branch>.

---
 lib/braid/rspec_git.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/braid/rspec_git.rb b/lib/braid/rspec_git.rb
index fc87ff9..4fd5cd9 100644
--- a/lib/braid/rspec_git.rb
+++ b/lib/braid/rspec_git.rb
@@ -9,6 +9,10 @@ def initialize(name, path, url)
       @url = url
     end
     
+    def msg(str)
+      puts "RSpec: #{str}"
+    end
+
     def plugins_fetched?
       submodules.all? {|s| File.directory?(s[:path]) }
     end
@@ -19,8 +23,9 @@ def update(target)
       repos.each do |r|
         if File.exist?(r[:path])
           msg "** Updating #{r[:name]}"
-          # target = ENV['REMOTE'] ? "#{ENV['REMOTE']} master" : ""
-          unless system("cd #{r[:path]} && git pull --rebase #{target}")
+          target = target ? target : "master" 
+          # unless system("cd #{r[:path]} && git pull --rebase #{target}")
+          unless system("cd #{r[:path]} && git pull --rebase #{r[:url]} #{target}")
             msg "Error updating #{r[:name]}"
             exit 1
           end