summaryrefslogtreecommitdiff
path: root/patches/dwmpatch
diff options
context:
space:
mode:
authorivan-boikov <ik.boikov.public@protonmail.com>2024-08-18 15:47:46 +0200
committerivan-boikov <ik.boikov.public@protonmail.com>2024-08-18 17:01:02 +0200
commit5665c01727b4d858d3180c42ae22ca1403ee0f06 (patch)
tree1eb1859ddfbb7484f7865bb61cecfb9a2d33ce56 /patches/dwmpatch
parent0da39e0c622ee84c0983416326da58c2f9dec66e (diff)
Do not delete patched branch on dwmpatch
Diffstat (limited to 'patches/dwmpatch')
-rwxr-xr-xpatches/dwmpatch5
1 files 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"