jenkins-bot has submitted this change and it was merged.
Change subject: Make clone --recursive compatible with puppet ensure check
......................................................................
Make clone --recursive compatible with puppet ensure check
git clone --recursive creates a text file at $submodule/.git, which
was causing the submodule checkout to fail.
Change-Id: I57e0f1a3f8fcd7e96b607bdabe40709fb3a5d459
---
M puppet/modules/git/manifests/clone.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index cca0e35..291cc7a 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -30,7 +30,7 @@
exec { "git clone ${title}":
command => "git clone --recursive ${url} ${directory}",
- creates => "${directory}/.git/refs/remotes",
+ creates => "${directory}/.git",
require => Package['git'],
user => 'vagrant',
environment => 'HOME=/home/vagrant',
--
To view, visit https://gerrit.wikimedia.org/r/96154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57e0f1a3f8fcd7e96b607bdabe40709fb3a5d459
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
