Skip to content
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.

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

Use explicit allow file protocol config flag when executing git submodule add command (Issue #828) #831

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions spec/overcommit/git_repo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@
end

submodule = repo do
`git submodule add #{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add \
#{nested_submodule} nested-sub 2>&1 > #{File::NULL}`
`git commit -m "Add nested submodule"`
end

repo do
`git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
example.run
end
end
Expand Down Expand Up @@ -150,7 +151,7 @@
end

before do
`git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
end

it { should_not include File.expand_path('sub') }
Expand Down Expand Up @@ -178,7 +179,8 @@
`git commit --allow-empty -m "Submodule commit"`
end

`git submodule add #{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add \
#{submodule} #{submodule_dir} 2>&1 > #{File::NULL}`
`git commit -m "Add submodule"`
end

Expand Down Expand Up @@ -282,7 +284,7 @@
touch 'tracked'
`git add tracked`
`git commit -m "Initial commit"`
`git submodule add #{submodule} sub 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add #{submodule} sub 2>&1 > #{File::NULL}`
touch 'staged'
`git add staged`
example.run
Expand Down Expand Up @@ -327,7 +329,7 @@
end

repo do
`git submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add #{submodule} sub-repo 2>&1 > #{File::NULL}`
`git commit -m "Initial commit"`
example.run
end
Expand All @@ -343,7 +345,8 @@
`git commit --allow-empty -m "Another submodule"`
end

`git submodule add #{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add \
#{another_submodule} another-sub-repo 2>&1 > #{File::NULL}`
end

it { should be_empty }
Expand All @@ -369,7 +372,8 @@
`git commit --allow-empty -m "Another submodule"`
end

`git submodule add #{another_submodule} yet-another-sub-repo 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add \
#{another_submodule} yet-another-sub-repo 2>&1 > #{File::NULL}`
`git commit -m "Add yet another submodule"`
`git rm sub-repo`
`git rm yet-another-sub-repo`
Expand Down
10 changes: 5 additions & 5 deletions spec/overcommit/hook_context/commit_msg_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
echo('Hello World', 'sub/submodule-file')
`git submodule foreach "git add submodule-file" < #{File::NULL}`
Expand Down Expand Up @@ -474,7 +474,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
echo('Hello World', 'sub/submodule-file')
`git submodule foreach "git add submodule-file" < #{File::NULL}`
Expand All @@ -500,7 +500,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
echo('Hello World', 'sub/submodule-file')
`git submodule foreach "git add submodule-file" < #{File::NULL}`
Expand Down Expand Up @@ -532,7 +532,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
`git rm sub`
example.run
Expand Down Expand Up @@ -561,7 +561,7 @@
end

repo do
`git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
expect(subject).to_not include File.expand_path('test-sub')
end
end
Expand Down
10 changes: 5 additions & 5 deletions spec/overcommit/hook_context/pre_commit_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
echo('Hello World', 'sub/submodule-file')
`git submodule foreach "git add submodule-file" < #{File::NULL}`
Expand Down Expand Up @@ -383,7 +383,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
echo('Hello World', 'sub/submodule-file')
`git submodule foreach "git add submodule-file" < #{File::NULL}`
Expand All @@ -409,7 +409,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
echo('Hello World', 'sub/submodule-file')
`git submodule foreach "git add submodule-file" < #{File::NULL}`
Expand Down Expand Up @@ -441,7 +441,7 @@
end

repo do
`git submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git -c protocol.file.allow=always submodule add #{submodule} sub > #{File::NULL} 2>&1`
`git commit -m "Add submodule"`
`git rm sub`
example.run
Expand Down Expand Up @@ -470,7 +470,7 @@
end

repo do
`git submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
`git -c protocol.file.allow=always submodule add #{submodule} test-sub 2>&1 > #{File::NULL}`
expect(subject).to_not include File.expand_path('test-sub')
end
end
Expand Down
4 changes: 2 additions & 2 deletions spec/overcommit/installer_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ def hook_files_installed?(hooks_dir)
context 'which has an external git dir' do
let(:submodule) { File.join(target, 'submodule') }
before do
system 'git', 'submodule', 'add', target, 'submodule',
chdir: target, out: :close, err: :close
system 'git', '-c', 'protocol.file.allow=always', 'submodule', 'add', target,
'submodule', chdir: target, out: :close, err: :close
end
let(:submodule_git_file) { File.join(submodule, '.git') }
let(:submodule_git_dir) do
Expand Down
Loading