diff options
| author | Prameet Shah <phshah@google.com> | 2017-11-28 03:00:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-28 03:00:26 +0000 |
| commit | 67d7a599c9978a50c740c9260e35be5806ba9b29 (patch) | |
| tree | 07215a361d165d0aad764476ea47473470081902 | |
| parent | dd79d2981eaddb927a17613f8be6af3b02caae98 (diff) | |
| parent | 2ddf281bb89372d902dfa889e319d8c406e1adf6 (diff) | |
| download | repohooks-67d7a599c9978a50c740c9260e35be5806ba9b29.tar.gz | |
Disallow external diff drivers in rh/git.py and google-java-format.py am: 9e01ab18dc
am: 2ddf281bb8
Change-Id: Idf40c3ea5b0899a7328fed33b1e45ae202c679be
| -rw-r--r-- | rh/git.py | 2 | ||||
| -rwxr-xr-x | tools/google-java-format.py | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -145,7 +145,7 @@ def raw_diff(path, target): """ entries = [] - cmd = ['git', 'diff', '-M', '--raw', target] + cmd = ['git', 'diff', '--no-ext-diff', '-M', '--raw', target] diff = rh.utils.run_command(cmd, cwd=path, capture_output=True).output diff_lines = diff.strip().splitlines() for line in diff_lines: diff --git a/tools/google-java-format.py b/tools/google-java-format.py index 3e88358..b0b164c 100755 --- a/tools/google-java-format.py +++ b/tools/google-java-format.py @@ -78,7 +78,7 @@ def main(argv): # TODO: Delegate to the tool once this issue is resolved: # https://github.com/google/google-java-format/issues/107 - diff_cmd = ['git', 'diff', '-U0', '%s^!' % opts.commit] + diff_cmd = ['git', 'diff', '--no-ext-diff', '-U0', '%s^!' % opts.commit] diff = rh.utils.run_command(diff_cmd, capture_output=True).output cmd = [opts.google_java_format_diff, '-p1', '--aosp'] |