diff --git a/Makefile b/Makefile index 2635d69..49f493a 100644 --- a/Makefile +++ b/Makefile @@ -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 $@