lib/gitlab_git/repository.rb in gitlab_git-7.1.8 vs lib/gitlab_git/repository.rb in gitlab_git-7.1.9
- old
+ new
@@ -784,10 +784,11 @@
current = txt.match(/(?<=").*(?=")/)[0]
results[current] = {}
else
next unless results[current]
match_data = txt.match(/(\w+)\s*=\s*(.*)/)
+ next unless match_data
results[current][match_data[1]] = match_data[2]
if match_data[1] == "path"
begin
results[current]["id"] = blob_content(commit, match_data[2])
@@ -851,10 +852,10 @@
def commit_touches_path?(commit, path, follow, walker)
entry = tree_entry(commit, path)
if commit.parents.empty?
# This is the root commit, return true if it has +path+ in its tree
- return entry != nil
+ return !entry.nil?
end
num_treesame = 0
commit.parents.each do |parent|
parent_entry = tree_entry(parent, path)