diff options
| -rw-r--r-- | rh/git.py | 2 | ||||
| -rwxr-xr-x | tools/google-java-format.py | 6 |
2 files changed, 6 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..0022c9d 100755 --- a/tools/google-java-format.py +++ b/tools/google-java-format.py @@ -52,6 +52,9 @@ def get_parser(): # 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 @@ 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_cmd.extend(['--'] + opts.files) diff = rh.utils.run_command(diff_cmd, capture_output=True).output cmd = [opts.google_java_format_diff, '-p1', '--aosp'] |