Merge pull request #3031 from dokku/3021-custom-branch-ps-rebuild

fix: ensure we respect DOKKU_DEPLOY_BRANCH when rebuilding applications

plugins/git/functions

@@ -142,10 +142,12 @@ git_hook_cmd() {
 git_build() {
   declare desc="setup and call git_build_app_repo"
   local APP="$1"
+  local DOKKU_DEPLOY_BRANCH REF
   if [[ $# -ge 2 ]]; then
     local REF="$2"
   else
-    local REF=$(< "$DOKKU_ROOT/$APP/refs/heads/master")
+    DOKKU_DEPLOY_BRANCH="$(git_deploy_branch "$APP")"
+    REF=$(< "$DOKKU_ROOT/$APP/refs/heads/$DOKKU_DEPLOY_BRANCH")
   fi
 
   # shellcheck disable=SC2086

tests/unit/20_config.bats

@@ -153,9 +153,19 @@ teardown() {
   echo "status: "$status
   assert_success
 
+  run ssh dokku@dokku.me ps:rebuild $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
   run ssh dokku@dokku.me config:set $TEST_APP DOKKU_DEPLOY_BRANCH=app-branch
   GIT_REMOTE_BRANCH=app-branch deploy_app
   echo "output: "$output
   echo "status: "$status
   assert_success
+
+  run ssh dokku@dokku.me ps:rebuild $TEST_APP
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
 }