0
@@ -51,39 +51,37 @@ namespace :git do
0
     if name.strip.empty?
0
       name = default
0
     end
0
-    sh "git checkout -b #{name}"
0
+    sh "git branch --track #{name}"
0
+    sh "git checkout #{name}"
0
   end
0
 
0
   desc "Push all changes to the rubinius repository"
0
   task :push => :update do
0
     branch = git_branch()
0
-    if branch != "master"
0
-      `git diff-files --quiet`
0
-      if $?.exitstatus == 1
0
-        puts "You have outstanding changes. Please commit them first."
0
-        exit 1
0
-      end
0
-
0
-      puts "* Merging topic '#{branch}' back into master..."
0
-      `git checkout master`
0
-      sh "git merge #{branch}"
0
-      switch = true
0
-    else
0
-      switch = false
0
+
0
+    rem = `git config branch.#{branch}.remote`.strip
0
+    if $?.exitstatus == 1
0
+      puts "This branch does not have tracking setup, so I'm unable to automatically pull into it. Please use 'rake git:topic' or 'git branch --track' to create your topic branches."
0
+      exit 1
0
     end
0
 
0
     puts "* Pushing changes..."
0
     sh "git push"
0
-
0
-    if switch
0
-      puts "* Switching back to #{branch}..."
0
-      `git checkout #{branch}`
0
-    end
0
   end
0
 
0
   desc "Pull new commits from the rubinius repository"
0
   task :update do
0
     check_git_ver
0
+    branch = git_branch()
0
+
0
+    # Test if this is a "root" branch or a topic branch.
0
+
0
+    rem = `git config branch.#{branch}.remote`.strip
0
+    if $?.exitstatus == 1
0
+      puts "This branch does not have tracking setup, so I'm unable to automatically pull into it. Please use 'rake git:topic' or 'git branch --track' to create your topic branches."
0
+      exit 1
0
+    end
0
+
0
     `git diff-files --quiet`
0
     if $?.exitstatus == 1
0
       stash = true
0
@@ -94,25 +92,9 @@ namespace :git do
0
       stash = false
0
     end
0
 
0
-    branch = git_branch()
0
-    if branch != "master"
0
-      switch = true
0
-      `git checkout master`
0
-      puts "* Switching back to master..."
0
-    else
0
-      switch = false
0
-    end
0
-
0
     puts "* Pulling in new commits..."
0
-    sh "git fetch"
0
-    sh "git rebase origin"
0
-    
0
-    if switch
0
-      puts "* Porting changes into #{branch}..."
0
-      `git checkout #{branch}`
0
-      sh "git rebase master"
0
-    end
0
-    
0
+    sh "git pull --rebase"
0
+
0
     if stash
0
       puts "* Applying changes..."
0
       sh "git stash apply"