From be95a619bcd603281c57250c359081a2ce8e8bb0 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 17 Jan 2021 22:06:30 -0500
Subject: [PATCH] fix: allow git pushes to apps that already exist but have old
 names

Users should still renamed their applications as this workaround will be removed at some point.

Closes #4308
---
 plugins/git/functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/functions b/plugins/git/functions
index 67222785e..f5316de5d 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -124,7 +124,7 @@ cmd-git-hook() {
   declare APP="$1"
   local DOKKU_DEPLOY_BRANCH
 
-  is_valid_app_name "$APP"
+  plugn trigger app-exists "$APP" 2>/dev/null || is_valid_app_name "$APP"
 
   DOKKU_DEPLOY_BRANCH="$(fn-git-deploy-branch "$APP")"
   if ! git check-ref-format --branch "$DOKKU_DEPLOY_BRANCH" >/dev/null 2>&1; then
@@ -219,8 +219,8 @@ cmd-git-glob() {
   declare cmd="git-*"
   local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
   local APP_PATH=$DOKKU_ROOT/$APP
-  is_valid_app_name "$APP"
 
+  plugn trigger app-exists "$APP" 2>/dev/null || is_valid_app_name "$APP"
   if [[ $1 == "git-receive-pack" && ! -d "$APP_PATH/refs" ]]; then
     ! plugn trigger app-exists "$APP" >/dev/null 2>&1 && plugn trigger app-maybe-create "$APP"