diff options
| author | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:38:16 +0200 |
|---|---|---|
| committer | Timothée Ravier <travier@redhat.com> | 2021-05-07 16:55:03 +0200 |
| commit | b8cca6cef14716987bbf7ef8f6edcbfc1688cc4c (patch) | |
| tree | 24f4a40d210627301078195634d7c8fe9915427c /ci | |
| parent | 135675243addec680b88f47c9a1e34b175fde6de (diff) | |
| download | ostree-b8cca6cef14716987bbf7ef8f6edcbfc1688cc4c.tar.gz | |
*: rename master branch to main
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ci-commitmessage-submodules.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/ci-commitmessage-submodules.sh b/ci/ci-commitmessage-submodules.sh index edc0d780..ebc18022 100755 --- a/ci/ci-commitmessage-submodules.sh +++ b/ci/ci-commitmessage-submodules.sh @@ -40,7 +40,7 @@ gitdir=$(realpath $(pwd)) # require a newer git, we could use `git worktree`. cp -a ${gitdir} ${tmpd}/workdir cd ${tmpd}/workdir -git log --pretty=oneline origin/master..$HEAD | while read logline; do +git log --pretty=oneline origin/main..$HEAD | while read logline; do commit=$(echo ${logline} | cut -f 1 -d ' ') # For merge commits, just check that they're empty (i.e. no conflict # resolution was needed). Otherwise, let's just error out. Conflicts should |