OTWO-5702: Clean modified files before switching branch

Author: kselvraj

lib/ohloh_scm/git/scm.rb

@@ -58,8 +58,8 @@ def clean_and_checkout_branch
         run "cd '#{url}' && git clean -f -d -x"
         return unless status.branch?(branch_name)
 
+        run "cd '#{url}' && git reset --hard HEAD"
         run "cd '#{url}' && git checkout #{branch_name} --"
-        run "cd '#{url}' && git reset --hard heads/#{branch_name} --"
       end
 
       def create_tracking_branch(branch_name)

lib/ohloh_scm/version.rb

@@ -2,7 +2,7 @@
 
 module OhlohScm
   module Version
-    STRING = '3.0.4'
+    STRING = '3.0.5'
     GIT = '2.17.1'
     SVN = '1.9.7'
     CVSNT = '2.5.04'

spec/ohloh_scm/activity_spec.rb

@@ -5,6 +5,7 @@
 describe 'Activity' do
   describe 'log_filename' do
     it 'should return system tmp dir path' do
+      ENV['OHLOH_SCM_TEMP_FOLDER_PATH'] = nil
       core = get_core(:git)
       scm = OhlohScm::Activity.new(core)
       scm.log_filename.must_equal "#{Dir.tmpdir}/foobar.log"