Merge commit '0e9aa8001a34' into th/l3cfg-17th/l3cfg-17

1 files changed, 4 insertions, 4 deletions

diff --git a/contrib/scripts/checkpatch-feature-branch.sh b/contrib/scripts/checkpatch-feature-branch.sh
index c46fcd4b5a..d6f72b2034 100755
--- a/contrib/scripts/checkpatch-feature-branch.sh
+++ b/contrib/scripts/checkpatch-feature-branch.sh
@@ -23,23 +23,23 @@ else
         git fetch origin "$(git rev-parse "$HEAD")" --no-tags --unshallow
         git fetch "$NM_UPSTREAM_REMOTE" \
             --no-tags \
-            "refs/heads/master:$BASE_REF/master" \
+            "refs/heads/main:$BASE_REF/main" \
             "refs/heads/nm-*:$BASE_REF/nm-*" \
             || die "failure to fetch from https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git"
     fi
 
     # the argument is only a single ref (or the default "HEAD").
-    # Find all commits that branch off one of the stable branches or master
+    # Find all commits that branch off one of the stable branches or main
     # and lead to $HEAD. These are the commits of the feature branch.
 
-    RANGES=( $(git show-ref | sed 's#^\(.*\) '"$BASE_REF/"'\(master\|nm-1-[0-9]\+\)$#\1..'"$HEAD"'#p' -n) )
+    RANGES=( $(git show-ref | sed 's#^\(.*\) '"$BASE_REF/"'\(main\|nm-1-[0-9]\+\)$#\1..'"$HEAD"'#p' -n) )
 
     [ "${#RANGES[@]}" != 0 ] || die "cannot detect git-ranges (HEAD is $(git rev-parse "$HEAD"))"
 
     REFS=( $(git log --reverse --format='%H' "${RANGES[@]}") )
 
     if [ "${#REFS[@]}" == 0 ] ; then
-        # no refs detected. This means, $HEAD is already on master (or one of the
+        # no refs detected. This means, $HEAD is already on main (or one of the
         # stable nm-1-* branches. Just check the patch itself.
         REFS=( "$HEAD" )
     fi