Merge "check_commit_msg_relnote_field_format: Fix indent on commit message" into main

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index 59b601a..90d16f1 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -282,7 +282,7 @@
 
     # If there's more than one fixup available, ask if they want to blindly run
     # them all, or prompt for them one-by-one.
-    mode = None
+    mode = 'some'
     if len(fixups) > 1:
         while True:
             response = rh.terminal.str_prompt(

rh/hooks.py

diff --git a/rh/hooks.py b/rh/hooks.py
index b2a30c8..1168720 100644
--- a/rh/hooks.py
+++ b/rh/hooks.py
@@ -1012,7 +1012,7 @@
 def check_aidl_format(project, commit, _desc, diff, options=None):
     """Checks that AIDL files are formatted with aidl-format."""
     # All *.aidl files except for those under aidl_api directory.
-    filtered = _filter_diff(diff, [r'\.aidl$'], [r'/aidl_api/'])
+    filtered = _filter_diff(diff, [r'\.aidl$'], [r'(^|/)aidl_api/'])
     if not filtered:
         return None
     aidl_format = options.tool_path('aidl-format')