From c9890de86fd843aea0fe1e07add2ce523ec18ef8 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Wed, 25 Nov 2020 07:41:08 +0100 Subject: [PATCH] extras/cherry-test: default to origin/master as master can be HEAD --- extras/misc/cherry-test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/misc/cherry-test.sh b/extras/misc/cherry-test.sh index f9ebf99fbd..892350b1e6 100755 --- a/extras/misc/cherry-test.sh +++ b/extras/misc/cherry-test.sh @@ -9,7 +9,7 @@ Check that cherry pick commits are properly formatted/documented. Differing patches are put in patches-new/ and patches-orig/ original_branch: the branch where the cherry-picked commits come from -commit_range : the commits to check (master..HEAD if not specified) +commit_range : the commits to check (origin/master..HEAD if not specified) - edits are marked as (cherry picked from commit ) (edited) @@ -31,7 +31,7 @@ ORIGINAL_BRANCH=$1 if test -n "$2"; then COMMIT_RANGE=$2 else - COMMIT_RANGE="master..HEAD" + COMMIT_RANGE="origin/master..HEAD" fi CHERY_PICK_DETECT="cherry picked from commit "