From 7d69169024eea07c814ed8d9303dbe100cabde6b Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Tue, 8 Dec 2020 11:34:06 +0100 Subject: [PATCH 1/2] travisify.sh: respect default branch name --- travisify.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/travisify.sh b/travisify.sh index 8c1c356..d05ef3e 100755 --- a/travisify.sh +++ b/travisify.sh @@ -82,8 +82,9 @@ process() { esac git fetch >/dev/null git diff-index --quiet HEAD -- || die "Dirty working copy" - branch=$(git rev-parse --abbrev-ref HEAD) - test "$branch" = "master" || die "Non-master branch: $branch" + currentBranch=$(git rev-parse --abbrev-ref HEAD) + defaultBranch=$(git remote show origin | grep "HEAD branch" | sed 's/.*: //') + test "$currentBranch" = "$defaultBranch" || die "Non-default branch: $currentBranch" git merge --ff --ff-only 'HEAD@{u}' >/dev/null || die "Cannot fast forward (local diverging?)" # test "$(git rev-parse HEAD)" = "$(git rev-parse 'HEAD@{u}')" || @@ -124,7 +125,7 @@ language: java jdk: openjdk8 branches: only: - - master + - $defaultBranch - "/.*-[0-9]+\\\\..*/" install: true script: "$travisBuildScript" From b812833edc273932679bda8ce742853b51ba29cf Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 11 Dec 2020 21:08:40 +0100 Subject: [PATCH 2/2] travisify.sh: generalize name of remote Signed-off-by: Jan Eglinger --- travisify.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/travisify.sh b/travisify.sh index d05ef3e..64058d3 100755 --- a/travisify.sh +++ b/travisify.sh @@ -83,7 +83,9 @@ process() { git fetch >/dev/null git diff-index --quiet HEAD -- || die "Dirty working copy" currentBranch=$(git rev-parse --abbrev-ref HEAD) - defaultBranch=$(git remote show origin | grep "HEAD branch" | sed 's/.*: //') + upstreamBranch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u}) + remote=${upstreamBranch%/*} + defaultBranch=$(git remote show "$remote" | grep "HEAD branch" | sed 's/.*: //') test "$currentBranch" = "$defaultBranch" || die "Non-default branch: $currentBranch" git merge --ff --ff-only 'HEAD@{u}' >/dev/null || die "Cannot fast forward (local diverging?)"