From 9242672525a3ee7301d998e43d1d04f6b70faa91 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Tue, 7 May 2024 08:33:48 +0200
Subject: [PATCH] merge_upstream.sh: Add flag to skip patch generation

Also checkout upstream/master for all repos until we push our own again.
---
 element-desktop   |  2 +-
 element-web       |  2 +-
 matrix-react-sdk  |  2 +-
 merge_upstream.sh | 11 ++++++++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 1885b7a..78992f4 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 1885b7a6c13733b440e0a30690a879b184ecbf73
+Subproject commit 78992f458b7f08696fca099c58e8c777d2ad5792
diff --git a/element-web b/element-web
index e74ce0a..4a895f6 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit e74ce0adbfe037334a848d475155e92d4fe73eea
+Subproject commit 4a895f6dafea7cbf2994469501426bf8e2d79e50
diff --git a/matrix-react-sdk b/matrix-react-sdk
index ab0b524..0c40f6d 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit ab0b52468ff27bbeef7fcbe166c44e68fc89471d
+Subproject commit 0c40f6d26f1662914521ed56507987149b462733
diff --git a/merge_upstream.sh b/merge_upstream.sh
index a9c3352..2e58aaf 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -4,12 +4,21 @@ set -e
 
 mydir="$(dirname "$(realpath "$0")")"
 
+if [ "$1" = "-k" ]; then
+    keep_patches=1
+    shift
+else
+    keep_patches=0
+fi
+
 pushd "$mydir" > /dev/null
 
 source ./merge_helpers.sh
 
 # Persist current state
-./generate_patches.sh
+if [ "$keep_patches" = 0 ]; then
+    ./generate_patches.sh
+fi
 
 # Abandon all local submodule state
 forall_repos git reset --hard