diff options
| author | Ken Barber <ken@bob.sh> | 2012-09-19 20:45:12 +0100 |
|---|---|---|
| committer | Ken Barber <ken@bob.sh> | 2012-09-19 20:45:12 +0100 |
| commit | a9f11badf3d0ab95c7ef9e7e52cdeccea970c1f1 (patch) | |
| tree | b94f15e43437bf1cbe640ebe97df67a65ada1780 | |
| parent | f3acccdfb8af8d98c8fc9c8e287ab22d27d62dac (diff) | |
| download | puppet-vcsrepo-a9f11badf3d0ab95c7ef9e7e52cdeccea970c1f1.tar.gz puppet-vcsrepo-a9f11badf3d0ab95c7ef9e7e52cdeccea970c1f1.tar.bz2 | |
(#16495, #15660) Fix regression for notifications and pulls on git provider
The last merge: 4d2942edc26e7cd144a3178a1a7f6470ea401345 brought some
regression that this patch should hopefully fix.
Firstly, the tool no longer supported updating a branch as the syntax for git
pull on anything but a branch was invalid.
This also removes the extra call to 'checkout' which was causing behaviour
to occur without notifying puppet, thus causing subscription notifications
to not fire.
| -rw-r--r-- | lib/puppet/provider/vcsrepo/git.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/provider/vcsrepo/git.rb b/lib/puppet/provider/vcsrepo/git.rb index afd9963..95115c6 100644 --- a/lib/puppet/provider/vcsrepo/git.rb +++ b/lib/puppet/provider/vcsrepo/git.rb @@ -96,8 +96,8 @@ Puppet::Type.type(:vcsrepo).provide(:git, :parent => Puppet::Provider::Vcsrepo) def update_references at_path do - checkout - git_with_identity('pull', @resource.value(:remote)) + git_with_identity('fetch', @resource.value(:remote)) + git_with_identity('fetch', '--tags', @resource.value(:remote)) update_owner_and_excludes end end |