From 62a9e2020ed767d847bd491030da5e7f8eeb589d Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Thu, 8 Apr 2021 10:07:32 +0200
Subject: [PATCH] ci-buildpackage: Avoid git-restore as it is too new

Use of `git restore` has been introduced in commit e954d2be4e0e
"ci-buildpackage: use wrap-and-sort as a workaround for odd packages".

It works on the Bullseye-based v2022dev2, but on older Buster-based
release `git restore` is not available.

Replace it with the old-style `git checkout`.

Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
 package-source-builder/overlay/usr/bin/ci-buildpackage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-source-builder/overlay/usr/bin/ci-buildpackage b/package-source-builder/overlay/usr/bin/ci-buildpackage
index d420932..a6c8357 100755
--- a/package-source-builder/overlay/usr/bin/ci-buildpackage
+++ b/package-source-builder/overlay/usr/bin/ci-buildpackage
@@ -20,7 +20,7 @@ apt-get -qy -o APT::Get::Build-Dep-Automatic=yes \
   build-dep "$(pwd)"
 
 # Revert changes made by `wrap-and-sort`
-git restore debian
+git checkout debian/
 
 dpkg-checkbuilddeps
 
-- 
GitLab