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

cmd/update-report: don't invoke external diff tools
Homebrew · May 9, 2023 · b3f7c6f · b3f7c6f
2 parents e06475b + 8e7d4a5
commit b3f7c6f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb
@@ -575,7 +575,7 @@ def diff
     @diff ||= if installed_from_api?
       # 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.
-      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
       add_delete_characters = ["+", "-"].freeze