From a9d95a9d06f3ab8def4b89b352fa6cedde940c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Tue, 20 Jul 2021 12:02:34 +0200
Subject: [PATCH] generate_lists: start with clean checkout

This should be used always when we apply patches as otherwise git tries
to do rebase on pull and if that passes then we try to reapply all
patches which fails. The cleanup simply nukes the original git history
thus we prevent these issues.
---
 generate_lists | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate_lists b/generate_lists
index 34aef499f..a4b4cf137 100755
--- a/generate_lists
+++ b/generate_lists
@@ -73,7 +73,7 @@ set_protected_build_dir "lists"
 url="$(get_feed "#" "$FEED_NAME" "$src_dir/feeds.conf")"
 tos_version="$("$src_dir/helpers/turris-version.sh" version)"
 
-git_checkout "$FEED_NAME" "$url" "$build_dir"
+git_clean_checkout "$FEED_NAME" "$url" "$build_dir"
 patch_repository "$FEED_NAME" "$build_dir"
 
 (
-- 
GitLab