Skip to content

Remove BasicSubmodules and related methods; use native config from git 3.x gem #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bastelfreak merged 3 commits into from
May 31, 2025
Merged

Remove BasicSubmodules and related methods; use native config from git 3.x gem #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca1dbbd
Remove BasicSubmodules and related methods; use native config from gi…
rwaffen May 31, 2025
3b96985
fix: remove space
rwaffen May 31, 2025
1d162db
fix: do rubocops biddings
rwaffen May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions lib/git/basic_submodules.rb
View file
Open in desktop

This file was deleted.

13 changes: 2 additions & 11 deletions lib/vanagon/component/source/git.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# but it provides a wealth of useful constants
require 'English'
require 'build/uri'
require 'git/basic_submodules'
require 'git'
require 'logger'
require 'timeout'

Expand Down Expand Up @@ -85,7 +85,7 @@ def github_source_type(url)
# Default options used when cloning; this may expand
# or change over time.
def default_options # rubocop:disable Lint/DuplicateMethods
@default_options ||= { ref: "HEAD" }
@default_options ||= { ref: "HEAD", config: ['submodule.recurse=true'] }
end
private :default_options

Expand Down Expand Up @@ -121,7 +121,6 @@ def fetch
end
checkout!
version
update_submodules
end

# Return the correct incantation to cleanup the source directory for a given source
Expand Down Expand Up @@ -201,14 +200,6 @@ def checkout!
end
private :checkout!

# Attempt to update submodules, and do not panic
# if there are no submodules to initialize
def update_submodules
VanagonLogger.info "Attempting to update submodules for repo '#{dirname}'"
clone.update_submodules(init: true)
end
private :update_submodules

# Determines a version for the given directory based on the git describe
# for the repository
#
Expand Down
2 changes: 0 additions & 2 deletions spec/lib/vanagon/component_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@
allow(::Git).to receive(:clone).and_return(clone)
allow(clone).to receive(:describe).and_return('4.5.6')
allow(clone).to receive(:checkout).and_return(nil)
allow(clone).to receive(:update_submodules).and_return(nil)
expect(component.force_version).to eq('4.5.6')
end

Expand All @@ -294,7 +293,6 @@
allow(::Git).to receive(:clone).and_return(clone)
allow(clone).to receive(:describe).and_return(nil)
allow(clone).to receive(:checkout).and_return(nil)
allow(clone).to receive(:update_submodules).and_return(nil)
expect{ component.force_version }.to raise_error(Vanagon::Error, /unable to determine source version/i)
end
end
Expand Down
2 changes: 1 addition & 1 deletion vanagon.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
gem.add_dependency('docopt', '~> 0.6.1')
# Handle git repos responsibly
# - MIT licensed: https://rubygems.org/gems/git
gem.add_dependency('git', '>= 1.13', '< 4')
gem.add_dependency('git', '~> 3.1')
# Parse scp-style triplets like URIs; used for Git source handling.
# - MIT licensed: https://rubygems.org/gems/build-uri
gem.add_dependency('build-uri', '~> 1.0')
Expand Down