From f784218d64d0b68b43aaa6759e09deaafbbe45d8 Mon Sep 17 00:00:00 2001
From: Patryk Matuszak <305846+pmtk@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:44:41 +0100
Subject: [PATCH] rebase patches: proper order & log rejected hunks

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 65f91c46ae..047a63da24 100644
--- a/Makefile
+++ b/Makefile
@@ -231,8 +231,8 @@ bin/lichen: bin vendor/modules.txt
 
 vendor:
 	go mod vendor
-	for p in $(wildcard scripts/auto-rebase/rebase_patches/*.patch); do \
+	for p in $(sort $(wildcard scripts/auto-rebase/rebase_patches/*.patch)); do \
 		echo "Applying patch $$p"; \
-		git mailinfo /dev/null /dev/stderr 2<&1- < $$p | git apply || exit 1; \
+		git mailinfo /dev/null /dev/stderr 2<&1- < $$p | git apply --reject || exit 1; \
 	done
 .PHONY: vendor