From b1ba9bf626d2a8eddf1619d28ee61bfb65b36915 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 20 Dec 2024 16:45:01 +0100 Subject: [PATCH] text in echo change in git-pr --- tools/git/git-pr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/git/git-pr b/tools/git/git-pr index 3e5e97634be..5a3185d05f2 100755 --- a/tools/git/git-pr +++ b/tools/git/git-pr @@ -152,7 +152,7 @@ fi currentBranch=$(git branch | grep "^*" | sed -e "s/^[*] //") if [ "${prDestinationBranch}" != "${currentBranch}" ] && [ ${force} -lt 1 ]; then echo "ERROR: This PR is made against branch '${prDestinationBranch}' while your current checked out branch is '${currentBranch}'." - echo "ERROR: Please make sure you're in the right branch and run this scipt again." + echo "ERROR: Please make sure you're in the right branch and run this script again." clean_up_and_exit 1 elif [ "${prDestinationBranch}" != "${currentBranch}" ] && [ ${force} -eq 1 ]; then echo "WARNING: You used --force to merge to '${currentBranch}' while this PR is for branch '${prDestinationBranch}'."