From 98e38bd70dc669531b76b9b80b44d26692bb8007 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 3 Apr 2022 13:14:27 -0400 Subject: [PATCH] chore: update log output for deploy-branch setting The code was referencing an env var that is no longer used in favor of a git plugin setting. --- plugins/git/functions | 2 +- plugins/git/internal-functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/git/functions b/plugins/git/functions index bfd69c7c9..5603aeb96 100755 --- a/plugins/git/functions +++ b/plugins/git/functions @@ -81,7 +81,7 @@ cmd-git-hook() { DOKKU_DEPLOY_BRANCH="$(fn-git-deploy-branch "$APP")" if ! git check-ref-format --branch "$DOKKU_DEPLOY_BRANCH" >/dev/null 2>&1; then - echo $'\e[1G\e[K'"-----> WARNING: Invalid branch name '$DOKKU_DEPLOY_BRANCH' specified via DOKKU_DEPLOY_BRANCH." + echo $'\e[1G\e[K'"-----> WARNING: Invalid branch name '$DOKKU_DEPLOY_BRANCH' specified via deploy-branch setting." echo $'\e[1G\e[K'"-----> For more details, please see the man page for 'git-check-ref-format.'" return fi diff --git a/plugins/git/internal-functions b/plugins/git/internal-functions index 68eeb098e..3fe7e0aca 100755 --- a/plugins/git/internal-functions +++ b/plugins/git/internal-functions @@ -388,7 +388,7 @@ fn-git-fetch() { DOKKU_DEPLOY_BRANCH="$(fn-git-deploy-branch "$APP")" if ! fn-git-cmd "$APP_ROOT" check-ref-format --branch "$DOKKU_DEPLOY_BRANCH" >/dev/null 2>&1; then - dokku_log_warn "Invalid branch name '$DOKKU_DEPLOY_BRANCH' specified via DOKKU_DEPLOY_BRANCH." + dokku_log_warn "Invalid branch name '$DOKKU_DEPLOY_BRANCH' specified via deploy-branch setting." dokku_log_warn "For more details, please see the man page for 'git-check-ref-format.'" return fi