Snap for 4471243 from cf7c9848a8de520f1ef4e9a1432fe00dd47ee58c to pi-release
Change-Id: Id6dd1af124d6887cffe42b8d241db5501cab69fe
diff --git a/rh/git.py b/rh/git.py
index fb3f0f4..5ce6c31 100644
--- a/rh/git.py
+++ b/rh/git.py
@@ -145,7 +145,7 @@
"""
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..0022c9d 100755
--- a/tools/google-java-format.py
+++ b/tools/google-java-format.py
@@ -52,6 +52,9 @@
# default to not sort imports, while letting callers override as desired.
parser.add_argument('--sort-imports', action='store_true',
help='If true, imports will be sorted.')
+ parser.add_argument('files', nargs='*',
+ help='If specified, only consider differences in '
+ 'these files.')
return parser
@@ -78,7 +81,8 @@
# 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_cmd.extend(['--'] + opts.files)
diff = rh.utils.run_command(diff_cmd, capture_output=True).output
cmd = [opts.google_java_format_diff, '-p1', '--aosp']
