ohloh_scm 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7ce58eb162cb90bd87f81492e7b81ee43bc6a3d1ed5469a2e772d316d6aa084f
-  data.tar.gz: ec0bc5a78784e98d1d381bbbfcd92d7e7d17c58a14660cdbe133f75bdd541c35
+SHA1:
+  metadata.gz: 1eba74f2f8aefc6d482ec6425cf73836fdfb58cd
+  data.tar.gz: 7275ff1620338c7e4d4087040ee34c17ca536f71
 SHA512:
-  metadata.gz: c6cf921619af3159e0bcd35627dc90c0d8e855da6a4191d7d02373d1fb7345723c15b8219783914faf5487cf4b94e2f2090f4cb1237dae025d2a9a6810e1ead1
-  data.tar.gz: 925a9357f8960cfb4fc144a83ecb78c17983e33ef015217b91a551961206a6b95e2ca03236b21bd0dea31628dcb8f8819e35726fdfb5470a029191298b5c5746
+  metadata.gz: 3794d2921caf4d60a2b0f86060575fabde5a965a788a1c267e3ce5d4b1f2951fdfd7d39ec1298037b7034bce7a9af52ee020efbf439c2f85dd4a4639ed28b80c
+  data.tar.gz: 2920c4fc6623cfbc3dd40c7479f3992c7757af0210cc811c7c57992b2c4f8e31dd71fae3a238ce280f6cc82eb8714cf0c2895c2b47677121bfa252a44b431a18

data/lib/ohloh_scm/adapters/git/misc.rb

@@ -36,8 +36,8 @@ module OhlohScm::Adapters
 			if FileTest.exist? git_path
 				run "cd '#{url}' && git clean -f -d -x"
 				if self.has_branch?
-                                  run "cd '#{url}' && git reset --hard heads/#{self.branch_name} --"
                                   run "cd '#{url}' && git checkout #{self.branch_name} --"
+                                  run "cd '#{url}' && git reset --hard heads/#{self.branch_name} --"
 				end
 			end
 		end

data/lib/ohloh_scm/version.rb

@@ -1,5 +1,5 @@
 module OhlohScm
   module Version
-    STRING = '2.4.5'
+    STRING = '2.4.6'
   end
 end

data/test/unit/git_pull_test.rb

@@ -28,5 +28,23 @@ module OhlohScm::Adapters
         end
       end
     end
+
+    def test_basic_pull_of_non_default_branch
+      # This should not change current/default branch(e.g. master) to point to the branch commit being pulled
+      # In this case master should not point to test branch commit
+      with_git_repository('git_with_multiple_branch', 'test') do |src|
+	OhlohScm::ScratchDir.new do |dest_dir|
+          dest = GitAdapter.new(:url => dest_dir, branch_name: 'test').normalize
+	  assert !dest.exist?
+	  dest.pull(src)
+          remote_master_branch_sha =  `cd #{dest_dir}  && git rev-parse origin/master`
+          master_branch_sha = `cd #{dest_dir}  && git rev-parse master`
+          test_branch_sha = `cd #{dest_dir}  && git rev-parse test`
+
+          assert_not_equal master_branch_sha, test_branch_sha 
+          assert_equal master_branch_sha, remote_master_branch_sha
 	end
+      end
+    end
+        end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohloh_scm
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - BlackDuck Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -461,6 +461,7 @@ files:
 - test/repositories/git_with_empty_merge.tgz
 - test/repositories/git_with_invalid_encoding.tgz
 - test/repositories/git_with_master_tag.tgz
+- test/repositories/git_with_multiple_branch.tgz
 - test/repositories/git_with_null_merge.tgz
 - test/repositories/hg.tgz
 - test/repositories/hg_dupe_delete.tgz
@@ -645,7 +646,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Source Control Management
@@ -932,6 +933,7 @@ test_files:
 - test/repositories/git_with_empty_merge.tgz
 - test/repositories/git_with_invalid_encoding.tgz
 - test/repositories/git_with_master_tag.tgz
+- test/repositories/git_with_multiple_branch.tgz
 - test/repositories/git_with_null_merge.tgz
 - test/repositories/hg.tgz
 - test/repositories/hg_dupe_delete.tgz