summaryrefslogtreecommitdiff
path: root/lib/puppet
diff options
context:
space:
mode:
authorBryan Jen <bryan.jen@gmail.com>2015-12-16 17:53:05 -0700
committerBryan Jen <bryan.jen@gmail.com>2015-12-16 17:53:05 -0700
commit268e599839f86f7d5dd4352e73c0f698dc4b0c18 (patch)
treeac8975cf7b95a41785db0ccd993751806e6621b7 /lib/puppet
parent4b909024000a7fb7ac3c0ce7373542fb75ad1379 (diff)
parent7fe9cb225b6458e468469597a54753f1ea621e00 (diff)
downloadpuppet-vcsrepo-268e599839f86f7d5dd4352e73c0f698dc4b0c18.tar.gz
puppet-vcsrepo-268e599839f86f7d5dd4352e73c0f698dc4b0c18.tar.bz2
Merge pull request #277 from godlikeachilles/master
fix branch existence determintaion functionality
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/provider/vcsrepo/git.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb
index 3b20a83..0249a3c 100644
--- a/lib/puppet/provider/vcsrepo/git.rb
+++ b/lib/puppet/provider/vcsrepo/git.rb
@@ -319,7 +319,7 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo)
def remote_branch_revision?(revision = @resource.value(:revision))
# git < 1.6 returns '#{@resource.value(:remote)}/#{revision}'
# git 1.6+ returns 'remotes/#{@resource.value(:remote)}/#{revision}'
- branch = at_path { branches.grep /(remotes\/)?#{@resource.value(:remote)}\/#{revision}/ }
+ branch = at_path { branches.grep /(remotes\/)?#{@resource.value(:remote)}\/#{revision}$/ }
branch unless branch.empty?
end