From 1e3f29ad981380ff22b0b0fba4a2ec4dc35c2c8d Mon Sep 17 00:00:00 2001
From: Domonkos Czinke <d.czinke@foodpanda.com>
Date: Wed, 10 Feb 2016 13:11:56 +0100
Subject: [PATCH] Fix issue when Dockerfile present but BUILDPACK_URL is set

---
 plugins/git/commands | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/commands b/plugins/git/commands
index 8ace412ee..43b2028d0 100755
--- a/plugins/git/commands
+++ b/plugins/git/commands
@@ -32,7 +32,7 @@ git_build_app_repo() {
   GIT_DIR="$DOKKU_ROOT/$APP" git tag -d "$TMP_TAG" &> /dev/null || true
   find -name .git -prune -exec rm -rf {} \; > /dev/null
 
-  if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]]; then
+  if [[ -f Dockerfile ]] && [[ "$([[ -f .env ]] && grep -q BUILDPACK_URL .env; echo $?)" != "0" ]] && [[ ! -f ".buildpacks" ]] && [[ "$(grep -q BUILDPACK_URL $DOKKU_ROOT/$APP/ENV)" ]]; then
     plugn trigger pre-receive-app "$APP" "dockerfile" "$TMP_WORK_DIR" "$REV"
     dokku receive "$APP" "dockerfile" "$TMP_WORK_DIR" | sed -u "s/^/"$'\e[1G'"/"
   else