From 3163aead88d0c422c37f45411c611b2fc891d88e Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer <jacob@gitlab.com> Date: Sun, 15 Jan 2017 13:21:34 -0500 Subject: [PATCH] Handle missing gitaly/workhorse in 'gdk update' --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cd574a1..06c0836 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ gitlab-shell/.git/pull: git stash && git checkout master && \ git pull --ff-only -gitaly-update: gitaly/.git/pull gitaly-clean gitaly/bin/gitaly +gitaly-update: ${gitaly_clone_dir}/.git gitaly/.git/pull gitaly-clean gitaly/bin/gitaly gitaly/.git/pull: cd ${gitaly_clone_dir} && \ @@ -189,7 +189,7 @@ localhost.key: gitlab-workhorse-setup: gitlab-workhorse/bin/gitlab-workhorse -gitlab-workhorse-update: gitlab-workhorse/.git/pull gitlab-workhorse-clean-bin gitlab-workhorse/bin/gitlab-workhorse +gitlab-workhorse-update: ${gitlab_workhorse_clone_dir}/.git gitlab-workhorse/.git/pull gitlab-workhorse-clean-bin gitlab-workhorse/bin/gitlab-workhorse gitlab-workhorse-clean-bin: rm -rf gitlab-workhorse/bin -- GitLab