From: Victor Julien Date: Wed, 31 Mar 2021 13:20:14 +0000 (+0200) Subject: ci: make format check use 6.0.x branch X-Git-Tag: suricata-6.0.3~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6262b737a22d29bc66da93ed827242f9a851497;p=thirdparty%2Fsuricata.git ci: make format check use 6.0.x branch --- diff --git a/scripts/clang-format.sh b/scripts/clang-format.sh index 86c3a8392c..7b4cc87539 100755 --- a/scripts/clang-format.sh +++ b/scripts/clang-format.sh @@ -342,7 +342,7 @@ function HelpCommand { # on master. If our branch has not been rebased on the latest master, this # would result in including all new commits on master! function FirstCommitOfBranch { - local first_commit=$(git rev-list origin/master..HEAD | tail -n 1) + local first_commit=$(git rev-list origin/master-6.0.x..HEAD | tail -n 1) echo $first_commit }