Use branch --contains instead of describe and filter tags by checking…

… to see if the tag is contained by the current branch

Conflicts:
	lib/thor-scmversion/git_version.rb

lib/thor-scmversion/git_version.rb

@@ -5,12 +5,17 @@ class GitVersion < ScmVersion
     class << self          
       def all_from_path(path)
         Dir.chdir(path) do
-          tags = Open3.popen3("git describe --tags --match *.*.*") { |stdin, stdout, stderr| stdout.read }.split(/\n/)
-          version_tags = tags.select { |tag| tag.match(ScmVersion::VERSION_FORMAT) }
-          version_tags.collect { |tag| from_tag(tag) }.sort.reverse
+          tags = Open3.popen3("git tag") { |stdin, stdout, stderr| stdout.read }.split(/\n/)
+          tags.select { |tag| tag.match(ScmVersion::VERSION_FORMAT) }
+            .collect { |tag| from_tag(tag) }
+            .select { |tag| contained_in_current_branch?(tag) }.sort.reverse
         end
       end
 
+      def contained_in_current_branch?(tag)
+        ShellUtils.sh("git branch --contains #{tag}") =~ /\*/
+      end
+
       def retrieve_tags
         ShellUtils.sh("git fetch --all")
       end

spec/lib/thor-scmversion/git_version_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+module ThorSCMVersion
+  describe GitVersion do
+    it "should detect if a commit is contained on a given branch" do
+      ShellUtils.stub(:sh).and_return(<<OUT)
+* constrain_bump_to_branch
+  master
+OUT
+      expect(GitVersion.contained_in_current_branch?('0.0.1')).to be_true
+    end
+  end
+end