From 5f5c366f6b9a4f37a58e119dd9fa862b2554c4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 30 Aug 2018 11:12:19 +0200
Subject: autopkg: try to fix pull

---
 autopkg-branch.mk | 3 ---
 autopkg-common.mk | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/autopkg-branch.mk b/autopkg-branch.mk
index 25e25e9..871cffb 100644
--- a/autopkg-branch.mk
+++ b/autopkg-branch.mk
@@ -6,9 +6,6 @@ ifndef PKG_SOURCE_BRANCH
 $(error You have to define PKG_SOURCE_BRANCH before pkgauto.mk include)
 endif
 
-# Explicitly fetch branch
-$(shell git $(GIT_ARGS) fetch --prune --prune-tags --force "$(PKG_SOURCE_URL)" "$(PKG_SOURCE_BRANCH):$(PKG_SOURCE_BRANCH)")
-
 PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) rev-parse "$(PKG_SOURCE_BRANCH)")
 PKG_VERSION:=$(shell git $(GIT_ARGS) describe --abbrev=0 --tags "$(PKG_SOURCE_BRANCH)")
 
diff --git a/autopkg-common.mk b/autopkg-common.mk
index 73cff51..c539e1a 100644
--- a/autopkg-common.mk
+++ b/autopkg-common.mk
@@ -13,12 +13,11 @@ TMP_REPO_PATH=$(DL_DIR)/autopkg/$(PKG_NAME)
 GIT_ARGS=--git-dir='$(TMP_REPO_PATH)' --bare
 
 # Clone/update git history to bare repository
-# TODO it is possible that this won't fetch when there is force push to repository
 $(shell \
 	if [ ! -d "$(TMP_REPO_PATH)" ]; then \
-		git clone --bare "$(PKG_SOURCE_URL)" "$(TMP_REPO_PATH)"; \
+		git clone --mirror "$(PKG_SOURCE_URL)" "$(TMP_REPO_PATH)"; \
 	else \
-		git $(GIT_ARGS) fetch --prune --prune-tags --force "$(PKG_SOURCE_URL)"; \
+		git $(GIT_ARGS) remote update origin; \
 	fi)
 
 
-- 
cgit v1.2.3