From c881147eea4e1b604b95ed8684a43f3e3c5c4bd9 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 16 Sep 2022 04:43:15 -0500 Subject: [PATCH] [wip] specify --allow-empty option when applying scratch.patch --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 675f2983..0b990bdf 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ TESTGROUND_TESTCASE ?= hello testground: mkdir -p scratch && rm -rf scratch/* && git clone --depth=1 "file://$${PWD}" "scratch/$$(basename $${PWD})" [[ $$(git status --porcelain) == "" ]] || (git diff --merge-base HEAD > "scratch/$$(basename $${PWD})/scratch.patch") - [[ $$(git status --porcelain) == "" ]] || (cd "scratch/$$(basename $${PWD})" && git apply scratch.patch) + [[ $$(git status --porcelain) == "" ]] || (cd "scratch/$$(basename $${PWD})" && git apply --allow-empty scratch.patch) rm -f "scratch/$$(basename $${PWD})/scratch.patch" git clean -ndfx | grep -v $(SCRATCH_IGNORE) | awk '{ print $$3 }' | xargs -I{} bash -c "test -d '{}' && echo '{}' || true" | xargs -I{} mkdir -p scratch/nim-codex/{} git clean -ndfx | grep -v $(SCRATCH_IGNORE) | awk '{ print $$3 }' | xargs -I{} cp -R {} scratch/nim-codex/{}