admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #15390 from Bo98/update-report-no-ext-diff

Browse Source 
cmd/update-report: don't invoke external diff tools
This commit is contained in:
Mike McQuaid 2023-05-09 08:34:35 +01:00 committed by GitHub
commit b3f7c6f7a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/update-report.rb
View File

@ -575,7 +575,7 @@ class Reporter
@diff ||= if installed_from_api? @diff ||= if installed_from_api?
# Hack `git diff` output with regexes to look like `git diff-tree` output. # Hack `git diff` output with regexes to look like `git diff-tree` output.
# Yes, I know this is a bit filthy but it saves duplicating the #report logic. # Yes, I know this is a bit filthy but it saves duplicating the #report logic.
diff_output = Utils.popen_read("git", "diff", api_names_before_txt, api_names_txt) diff_output = Utils.popen_read("git", "diff", "--no-ext-diff", api_names_before_txt, api_names_txt)
header_regex = /^(---|\+\+\+) /.freeze header_regex = /^(---|\+\+\+) /.freeze
add_delete_characters = ["+", "-"].freeze add_delete_characters = ["+", "-"].freeze