sanitize-commit: don't make unknown cherry-pick SHA-1's fatalHEADmaster

The SHA-1 might just be from the tqtc- version of the repo and so this
bot complaint should be overridable by reviewers. So don't issue a -2
in this case.

We had at least one cherry-pick from lts-6.5 to dev where this is
blocking.

As a drive-by, on reviewer request, also change the warning message
itself.

Change-Id: Ifc7c4c5129bf9ad921bb6aba737b1a7076476d2c
Reviewed-by: Volker Hilsheimer <[email protected]>

1 files changed, 1 insertions, 1 deletions

diff --git a/git-hooks/sanitize-commit b/git-hooks/sanitize-commit
index 5ec434e..9ff78c5 100755
--- a/git-hooks/sanitize-commit
+++ b/git-hooks/sanitize-commit
@@ -398,7 +398,7 @@ sub check_cherry_pick($)
     chomp(my $origBase = `git merge-base $orig @allHds 2> /dev/null`);
     if ($origBase ne $orig) {
         # Most likely not integrated yet, but may also be a wip/ branch.
-        complain_ln("Cherry-pick's source is not an upstream commit", "cherry", 1);
+        complain_ln("Cherry-pick's source is not a valid merged commit", "cherry");
     } elsif ($handleLts) {
         complain("Cherry-pick will be subsequently merged with its source branch", "cherry");
     }