Oneric/wf_akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make: always git reset on patch renewal

Browse source 
If a patch changed inbetween application and reversal
changed/remove parts might persist otherwise
This commit is contained in:
Oneric 2024-10-08 04:00:07 +02:00
parent 54a30ff6d5
commit d212cf58c9
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -40,9 +40,11 @@ submodule.stamp:
patch.stamp: submodule.stamp patches/series patches/000_plant-a-forest.patch $(wildcard patches/*.patch)
@echo "Applying patches"
@# `pop -a` return 2 if currently no patches applied, thus ignore exit code
@cd $(SUBMODULE_NAME) && \
$(QUILT) pop -qfa; \
$(QUILT) push -a
@cd $(SUBMODULE_NAME) && { \
$(QUILT) pop -qfa; \
git reset --hard && \
$(QUILT) push -a; \
}
@touch $@