No longer removing and re-adding remotes that already exist

winton · Oct 4, 2012 · 0e64f93 · 0e64f93
1 parent eb4e515
commit 0e64f93
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/features/push.feature b/features/push.feature
@@ -15,7 +15,6 @@ Scenario: Collaborator
   Then output includes
     """
     Retrieving branch information from gitcycle.
-    Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
     Merging remote branch 'master-ticket.id' from 'config.owner/config.repo'.
     Pushing branch 'config.owner/master-ticket.id'.

diff --git a/features/qa.feature b/features/qa.feature
@@ -62,7 +62,6 @@ Scenario: QA issue pass w/ issue number
     Pushing branch 'qa_master_config.user'.
     Retrieving branch information from gitcycle.
     Checking out branch 'master'.
-    Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
     Merging remote branch 'qa_master_config.user' from 'config.owner/config.repo'.
     Pushing branch 'master'.
@@ -78,7 +77,6 @@ Scenario: QA issue pass
     """
     Retrieving branch information from gitcycle.
     Checking out branch 'master'.
-    Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
     Merging remote branch 'qa_master_config.user' from 'config.owner/config.repo'.
     Pushing branch 'master'.

diff --git a/features/ready.feature b/features/ready.feature
@@ -12,7 +12,6 @@ Scenario: Ready issue
   Then output includes
     """
     Retrieving branch information from gitcycle.
-    Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
     Merging remote branch 'master' from 'config.owner/config.repo'.
     Adding remote repo 'config.user/config.repo'.
@@ -48,10 +47,8 @@ Scenario: Reopen pull request
   Then output includes
     """
     Retrieving branch information from gitcycle.
-    Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
     Merging remote branch 'master' from 'config.owner/config.repo'.
-    Adding remote repo 'config.user/config.repo'.
     Fetching remote 'config.user'.
     Merging remote branch 'master-ticket.id' from 'config.user/config.repo'.
     Creating GitHub pull request.
@@ -79,7 +76,6 @@ Scenario: Collaborator
   Then output includes
     """
     Retrieving branch information from gitcycle.
-    Adding remote repo 'config.owner/config.repo'.
     Fetching remote 'config.owner'.
     Merging remote branch 'some_branch' from 'config.owner/gitcycle_test'.
     Pushing branch 'config.owner/some_branch'.

diff --git a/lib/gitcycle.rb b/lib/gitcycle.rb
@@ -536,9 +536,10 @@ def add_remote_and_fetch(options={})
     unless $remotes[owner]
       $remotes[owner] = true
 
-      puts "Adding remote repo '#{owner}/#{repo}'.\n".green
-      run("git remote rm #{owner}") if remotes(:match => owner)
-      run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
+      unless remotes(:match => owner)
+        puts "Adding remote repo '#{owner}/#{repo}'.\n".green
+        run("git remote add #{owner} git@github.com:#{owner}/#{repo}.git")
+      end
 
       puts "Fetching remote '#{owner}'.\n".green
       run("git fetch -q #{owner}")