Skip to content
Snippets Groups Projects
Commit ec0a121c authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'ignore-crlf-gitmodules' into 'master'

Ignore CRLFs in .gitmodules

.gitmodules files that had CRLFs would cause `blob_content` to fail to lookup the submodule. For example, `ext/apr\n` would not be found when `ext/apr` was the right name.

Closes gitlab-org/gitlab-ce#2262

See merge request !42
parents ddc7cc81 30e0cd2c
No related branches found
No related tags found
No related merge requests found
Pipeline #
v 7.2.14
- Ignore CRLFs in .gitmodules (Stan Hu)
v 7.2.13
- Fix Blob#commit when pass full ref like refs/head/master
 
Loading
Loading
Loading
Loading
@@ -842,11 +842,12 @@ module Gitlab
next unless results[current]
match_data = txt.match(/(\w+)\s*=\s*(.*)/)
next unless match_data
results[current][match_data[1]] = match_data[2]
target = match_data[2].chomp
results[current][match_data[1]] = target
 
if match_data[1] == "path"
begin
results[current]["id"] = blob_content(commit, match_data[2])
results[current]["id"] = blob_content(commit, target)
rescue InvalidBlobName
results.delete(current)
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment