diff options
| -rwxr-xr-x | git-hooks/sanitize-commit | 2 |
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"); } |