aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrameet Shah <phshah@google.com>2017-11-28 02:57:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-28 02:57:27 +0000
commitdb638ae112d1fb3f859c5d3f4b45880635030762 (patch)
tree87bc738f6efbabf5b2c21c1574b68f124214300d
parent2ddf281bb89372d902dfa889e319d8c406e1adf6 (diff)
parentcc9b46c682c9fe1669e44c6b56f649cfdd6e3ceb (diff)
downloadrepohooks-db638ae112d1fb3f859c5d3f4b45880635030762.tar.gz
am: cc9b46c682 Change-Id: Ib0226d718d7a959ef15de6a6c4bfe582e7603107
-rwxr-xr-xtools/google-java-format.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/google-java-format.py b/tools/google-java-format.py
index b0b164c..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
@@ -79,6 +82,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', '--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']