Techognito/starter-kit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile: Replace git restore command

Browse source 
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
This commit is contained in:
Martin Pitt 2020-09-22 07:51:54 +02:00 • committed by GitHub
parent 0a47c6f034
commit 661ca771b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -161,7 +161,7 @@ src/lib/patternfly/_fonts.scss:
git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 227 git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 227
mkdir -p pkg/lib/patternfly && git add pkg/lib/patternfly mkdir -p pkg/lib/patternfly && git add pkg/lib/patternfly
git checkout --force FETCH_HEAD -- 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 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 # force serialization of the targets that call git, as they compete for the git lock