From c9af7e4cfaddb5f7045365294cfdde92b121c526 Mon Sep 17 00:00:00 2001
From: Vincent Tavernier <vince.tavernier@gmail.com>
Date: Mon, 2 Oct 2017 09:26:13 +0200
Subject: [PATCH 1/2] Fix #2915

Add forward slash cleanup of the app name for the git-upload-pack
command. Prevents is_valid_app_name from removing the application folder
on `git fetch`.
---
 plugins/git/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/functions b/plugins/git/functions
index 37eeea70b..64ec4449b 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -153,7 +153,7 @@ git_build() {
 git_upload_pack_cmd() {
   declare desc="executes git-upload-pack"
   local cmd="git-upload-pack"
-  local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
+  local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
   is_valid_app_name "$APP"
   plugn trigger git-pre-pull "$APP"
   cat | git-upload-pack "$DOKKU_ROOT/$APP"

From c25ef5dc4c6b8cc8a12c4d5a521373fef4d92920 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 2 Oct 2017 11:57:50 -0400
Subject: [PATCH 2/2] fix: Declare and assign separately to avoid masking
 return values

---
 plugins/git/functions | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/git/functions b/plugins/git/functions
index 64ec4449b..051ceb54d 100755
--- a/plugins/git/functions
+++ b/plugins/git/functions
@@ -152,8 +152,9 @@ git_build() {
 
 git_upload_pack_cmd() {
   declare desc="executes git-upload-pack"
-  local cmd="git-upload-pack"
-  local APP="$(echo "$2" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
+  declare cmd="git-upload-pack"
+  declare APP="$2"
+  APP="$(echo "$APP" | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g' | sed 's/^\///g')"
   is_valid_app_name "$APP"
   plugn trigger git-pre-pull "$APP"
   cat | git-upload-pack "$DOKKU_ROOT/$APP"