From 0685d04843a724189f4c47b992e0aa76f87bdd19 Mon Sep 17 00:00:00 2001
From: Daniel Schulte <trilader@gmail.com>
Date: Mon, 29 Sep 2014 19:40:43 +0200
Subject: [PATCH] Added workaround for checking out lipstick git into non empty
 filesystem image

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 263a91c..cf64824 100644
--- a/Makefile
+++ b/Makefile
@@ -205,9 +205,12 @@ $(call gentargets,$(INITRD_TARGET)) : $(call archdir,%)$(STATE_DIR)/initrd_remas
 	cd "$(call archdir,$*)$(INITRD)" && find | cpio -H newc -o | lzma -z > "$(call archdir,$*)$(INITRD_TARGET)"
 
 image_git $(IMAGE_DIR)/.git: |$(WORKSPACE)
-	mkdir -p "$(IMAGE_DIR)"
 	test ! -e "$(IMAGE_DIR)/.git"
-	cd "$(IMAGE_DIR)" && git clone "$(IMAGE_GIT_URL)" .
+	mkdir -p "$(IMAGE_DIR)"
+	cd "$(IMAGE_DIR)" && git init
+	cd "$(IMAGE_DIR)" && git remote add origin "$(IMAGE_GIT_URL)"
+	cd "$(IMAGE_DIR)" && git fetch
+	cd "$(IMAGE_DIR)" && git checkout -t "origin/$(IMAGE_GIT_BRANCH)"
 
 image_git_pull: |$(IMAGE_DIR)/.git
 	cd "$(IMAGE_DIR)" && $(SHELL) ./scripts/update_stick.sh "$(IMAGE_GIT_BRANCH)"
-- 
GitLab