commit 69d3e18502d1cb317938ab86cf94aba2ee8e608f
author LaMont Jones <lamontjones@chromium.org> Wed Mar 11 15:00:53 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Mar 12 17:09:25 2020 +0000
tree 2232fc2f431525beb50bfaf3b488144f01d4e2f2
parent fb5e8bf47e1ce3b827dca136c26bfe5256565d58

pre-upload.py: --pre-submit has no description

`pre-upload.py --pre-submit` failed printing commit description.

BUG=chromium:1060760
TEST=manually verified

Change-Id: I15eb3a9c41529c40a3ffa2ac28ff1b3bfc7d9ae3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/repohooks/+/2098999
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Auto-Submit: LaMont Jones <lamontjones@chromium.org>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index c0bd20b..f897ccc 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -2070,7 +2070,9 @@
   for i, commit in enumerate(commit_list):
     CACHE.clear()
 
-    desc = _get_commit_desc(commit)
+    # If run with --pre-submit, then commit is PRE_SUBMIT, and not a commit.
+    # Use that as the description.
+    desc = commit if commit == PRE_SUBMIT else _get_commit_desc(commit)
     print('[%s %i/%i %s] %s' %
           (color.Color(color.CYAN, 'COMMIT'), i + 1, commit_count, commit[0:12],
            desc.splitlines()[0]))