From 661ca771b384e2a6e8685d99b2dba8c85a3e698f Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 22 Sep 2020 07:51:54 +0200 Subject: [PATCH] Makefile: Replace `git restore` command This is a relatively recent git feature which is not present in e.g. Debian 9 yet. Use `git reset` instead, like in the test/common rule. Fixes #369 Closes #370 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 48f60b2..47c2ec7 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,7 @@ src/lib/patternfly/_fonts.scss: git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 227 mkdir -p pkg/lib/patternfly && git add pkg/lib/patternfly git checkout --force FETCH_HEAD -- pkg/lib/patternfly - git restore --staged pkg/lib/patternfly + git reset -- pkg/lib/patternfly mkdir -p src/lib && mv pkg/lib/patternfly src/lib/patternfly && rmdir -p pkg/lib # force serialization of the targets that call git, as they compete for the git lock