Fix set-upstream deprecation warnings

LBRapid · LBRapid · commit 2c14de20574a · 2013-02-22T10:53:37.000-05:00
diff --git a/lib/git_remote_branch.rb b/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)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class NotOnGitRepositoryError < RuntimeError; end`
`37`	`37`	`:commands => [`
`38`	`38`	`'"#{GIT} push #{origin} #{branch_name}:refs/heads/#{branch_name}"',`
`39`	`39`	`'"#{GIT} fetch #{origin}"',`
`40`		`- '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"',`
	`40`	`+ '"#{GIT} branch --set-upstream-to=#{origin}/#{branch_name} #{branch_name}"',`
`41`	`41`	`'"#{GIT} checkout #{branch_name}"'`
`42`	`42`	`]`
`43`	`43`	`},`
`@@ -70,7 +70,7 @@ class NotOnGitRepositoryError < RuntimeError; end`
`70`	`70`	`:aliases => %w{track follow grab fetch},`
`71`	`71`	`:commands => [`
`72`	`72`	`'"#{GIT} fetch #{origin}"',`
`73`		`- '"#{GIT} branch --set-upstream #{branch_name} #{origin}/#{branch_name}"'`
	`73`	`+ '"#{GIT} branch --set-upstream-to=#{origin}/#{branch_name} #{branch_name}"'`
`74`	`74`	`]`
`75`	`75`	`}`
`76`	`76`	`} unless defined?(COMMANDS)`