From 27c3e3d57162b547f2da8fe0cca7f8e18ca8ee25 Mon Sep 17 00:00:00 2001 From: nrb <freifunk@nicoboehr.de> Date: Sat, 5 Jun 2021 20:59:06 +0200 Subject: [PATCH] fix patches not being applied --- update-gluon.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/update-gluon.sh b/update-gluon.sh index fbfc39c..c6d4a09 100755 --- a/update-gluon.sh +++ b/update-gluon.sh @@ -28,6 +28,7 @@ if git rev-parse --verify "remotes/origin/$fork_newest_minor_branch" &> /dev/nul fi git checkout "$upstream_newest_minor" +git am ../patches/* git checkout -b "$fork_newest_minor_branch" git tag -a "$fork_newest_minor_tag" -m "Gluon FFS $fork_newest_minor_tag" git push origin "$fork_newest_minor_branch" -- GitLab