Add support for automatic fixups to google-java-format am: d1fd88b71c
am: 1f99b7db96
Change-Id: I718ee21301b434aac39692d1c1a4bc6fd81af5fa
diff --git a/rh/hooks.py b/rh/hooks.py
index 47926bc..4e456e1 100644
--- a/rh/hooks.py
+++ b/rh/hooks.py
@@ -315,10 +315,13 @@
tool = get_helper_path('google-java-format.py')
google_java_format = options.tool_path('google-java-format')
google_java_format_diff = options.tool_path('google-java-format-diff')
- cmd = [tool, '--google-java-format', google_java_format,
- '--google-java-format-diff', google_java_format_diff,
- '--commit', commit] + options.args()
- return _check_cmd('google-java-format', project, commit, cmd)
+ tool_args = ['--google-java-format', google_java_format,
+ '--google-java-format-diff', google_java_format_diff,
+ '--commit', commit] + options.args()
+ cmd = [tool] + tool_args
+ fixup_func = _fixup_func_caller([tool, '--fix'] + tool_args)
+ return _check_cmd('google-java-format', project, commit, cmd,
+ fixup_func=fixup_func)
def check_commit_msg_bug_field(project, commit, desc, _diff, options=None):
