From: Bobby R. Bruce <bbruce@ucdavis.edu>
Date: Mon, 10 Feb 2020 20:07:52 +0000 (-0800)
Subject: misc: Updated git-commit-msg.py to print rejected commit
X-Git-Tag: v20.0.0.0~525
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b14697463b533df3c070b1d8e94fae53abf2736;p=gem5.git

misc: Updated git-commit-msg.py to print rejected commit

A rejected commit is now printed to stdout. This adds an additional
level of security if the ".git/COMMIT_EDITMSG" is deleted/overwritten.

Jira: https://gem5.atlassian.net/browse/GEM5-321
Change-Id: I87d463f7c40024d68bf78705f0d02fcea9f0eeeb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/25343
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/util/git-commit-msg.py b/util/git-commit-msg.py
index 1ce8aa171..9d958e85e 100755
--- a/util/git-commit-msg.py
+++ b/util/git-commit-msg.py
@@ -45,10 +45,19 @@ def _printErrorQuit(error_message):
             failure.
     """
     print(error_message)
+
+    print("The commit has been cancelled, but a copy of it can be found in "
+            + sys.argv[1] + " : ")
+
     print("""
-The commit has been canceled, but a copy of it can be found in
-.git/COMMIT_EDITMSG
+--------------------------------------------------------------------------
+    """)
+    print(open(sys.argv[1], "r").read())
+    print("""
+--------------------------------------------------------------------------
+    """)
 
+    print("""
 The first line of a commit must contain one or more gem5 tags separated by
 commas (see MAINTAINERS for the possible tags), followed by a colon and a
 commit title. There must be no leading nor trailing whitespaces.
@@ -67,7 +76,6 @@ e.g.:
 
     The packet class...
 """)
-    print("A copy of your commit message can be found in " + sys.argv[1])
     sys.exit(1)
 
 def _validateTags(commit_header):