From 5665c01727b4d858d3180c42ae22ca1403ee0f06 Mon Sep 17 00:00:00 2001 From: ivan-boikov Date: Sun, 18 Aug 2024 15:47:46 +0200 Subject: Do not delete patched branch on dwmpatch --- patches/dwmpatch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/patches/dwmpatch b/patches/dwmpatch index 91f3e79..df27781 100755 --- a/patches/dwmpatch +++ b/patches/dwmpatch @@ -26,10 +26,9 @@ branches=$(git for-each-ref --format='%(refname:short)' refs/heads/ | grep diff) for branch in $branches; do git branch -D $branch || exit done -# branch for merged patches -git branch -D patched -git checkout -b "patched" +git checkout -b "patched" || git switch "patched" +git status for patchfile in *.diff; do apply_patch "$patchfile" || (git switch "patches" && exit) git switch -q "patched" -- cgit v1.2.3