Browse Source

extras/cherry-test: default to origin/master as master can be HEAD

pull/118/head
Steve Lhomme 6 years ago
parent
commit
c9890de86f
  1. 4
      extras/misc/cherry-test.sh

4
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/ Differing patches are put in patches-new/ and patches-orig/
original_branch: the branch where the cherry-picked commits come from 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 - edits are marked as
(cherry picked from commit <hash>) (edited) (cherry picked from commit <hash>) (edited)
@ -31,7 +31,7 @@ ORIGINAL_BRANCH=$1
if test -n "$2"; then if test -n "$2"; then
COMMIT_RANGE=$2 COMMIT_RANGE=$2
else else
COMMIT_RANGE="master..HEAD" COMMIT_RANGE="origin/master..HEAD"
fi fi
CHERY_PICK_DETECT="cherry picked from commit " CHERY_PICK_DETECT="cherry picked from commit "

Loading…
Cancel
Save