github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-31 21:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge_upstream.sh: Add flag to skip patch generation

Browse Source 
Also checkout upstream/master for all repos until we push our own again.
This commit is contained in:
SpiritCroc 2024-05-07 08:33:48 +02:00
parent b0d22fba6b
commit 9242672525
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
element-desktop

@ -1 +1 @@
Subproject commit 1885b7a6c13733b440e0a30690a879b184ecbf73
Subproject commit 78992f458b7f08696fca099c58e8c777d2ad5792

2
element-web

@ -1 +1 @@
Subproject commit e74ce0adbfe037334a848d475155e92d4fe73eea
Subproject commit 4a895f6dafea7cbf2994469501426bf8e2d79e50

2
matrix-react-sdk

@ -1 +1 @@
Subproject commit ab0b52468ff27bbeef7fcbe166c44e68fc89471d
Subproject commit 0c40f6d26f1662914521ed56507987149b462733

11
merge_upstream.sh
View File

@ -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