Skip to content
Browse files

Merge pull request #13 from LBRapid/deprecation-fix

Fix set-upstream deprecation warnings
  • Loading branch information...
2 parents a79c9ff + 2c14de2 commit d74a503605bafd7650b455b5988e4101a3483aff @webmat committed Feb 22, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/git_remote_branch.rb
View
4 lib/git_remote_branch.rb
@@ -37,7 +37,7 @@ class NotOnGitRepositoryError < RuntimeError; end
:commands => [
'"#{GIT} push #{origin} #{branch_name}:refs/heads/#{branch_name}"',
'"#{GIT} fetch #{origin}"',
- '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"',
+ '"#{GIT} branch --set-upstream-to=#{origin}/#{branch_name} #{branch_name}"',
'"#{GIT} checkout #{branch_name}"'
]
},
@@ -70,7 +70,7 @@ class NotOnGitRepositoryError < RuntimeError; end
:aliases => %w{track follow grab fetch},
:commands => [
'"#{GIT} fetch #{origin}"',
- '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"'
+ '"#{GIT} branch --set-upstream-to=#{origin}/#{branch_name} #{branch_name}"'
]
}
} unless defined?(COMMANDS)

0 comments on commit d74a503

Please sign in to comment.
Something went wrong with that request. Please try again.