From 53ab906c8ecdbfc204887b20f8ed157caf4e0314 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 11 Mar 2019 14:53:06 -0400 Subject: libs/git: Prefix branch names with "libreboot-" This is a slight mitigation against branch name collisions. More robust handling should be added in the future but this is simple enough and provides some clear indication which branches have been created by the build system. --- libs/git | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'libs/git') diff --git a/libs/git b/libs/git index 03df3537..3d9facee 100755 --- a/libs/git +++ b/libs/git @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +BRANCH_PREFIX="libreboot-" DOTGIT=".git" HEAD="HEAD" ORIGIN_HEAD="origin/HEAD" @@ -325,7 +326,7 @@ git_project_prepare_patch() { local configs_path="$project_path/$CONFIGS" local prepare_branch local prepare_path - local branch=$project + local branch=$BRANCH_PREFIX$project local argument local path @@ -371,7 +372,7 @@ git_project_prepare_revision() { local configs_path="$project_path/$CONFIGS" local prepare_branch local prepare_revision - local branch=$project + local branch=$BRANCH_PREFIX$project local argument local path @@ -416,7 +417,7 @@ git_project_prepare_check() { local project_path=$(project_path "$project") local configs_path="$project_path/$CONFIGS" local prepare_branch - local branch=$project + local branch=$BRANCH_PREFIX$project local argument local path @@ -458,7 +459,7 @@ git_project_prepare_clean() { local repository_path=$(git_project_repository_path "$repository") local prepare_branch - local branch=$project + local branch=$BRANCH_PREFIX$project local argument for argument in "" "$@" @@ -500,7 +501,7 @@ git_project_checkout() { local repository_path=$(git_project_repository_path "$repository") local checkout_branch - local branch=$project + local branch=$BRANCH_PREFIX$project local argument for argument in "" "$@" @@ -560,7 +561,7 @@ git_project_release() { local repository_path=$(git_project_repository_path "$repository") local release_branch - local branch=$project + local branch=$BRANCH_PREFIX$project local argument for argument in "" "$@" @@ -601,7 +602,7 @@ git_project_release_check() { local repository_path=$(git_project_repository_path "$repository") local release_branch - local branch=$project + local branch=$BRANCH_PREFIX$project local argument for argument in "" "$@" -- cgit v1.2.3-70-g09d2