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

Make merge_helpers.sh smarter if you have the commit around

Browse Source
This commit is contained in:
SpiritCroc 2024-08-18 11:45:47 +02:00
parent a23614d3de
commit a49c66538c
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
merge_helpers.sh
View File

@ -264,7 +264,29 @@ apply_patches() {
pushd "$repo" pushd "$repo"
for patch in "$patch_dir"/*; do for patch in "$patch_dir"/*; do
echo "Applying $patch to $repo..." echo "Applying $patch to $repo..."
git am "$patch" || read -p "Applying $patch failed, please commit manually, then press enter: " git am "$patch" || on_apply_patch_fail_try_original_commit "$patch" "$repo"
done done
popd popd
} }
on_apply_patch_fail_try_original_commit() {
local patch="$1"
local repo="$2"
local orig_commit="$(head -n 1 "$patch"|sed 's|From ||;s| .*||')"
echo "Applying $patch failed, trying with original commit $orig_commit..."
git am --abort
git cherry-pick "$orig_commit" || on_apply_patch_fail "$patch" "$repo" "$orig_commit"
}
on_apply_patch_fail() {
local patch="$1"
local repo="$2"
local orig_commit="$3"
echo "----------------------------------"
echo "Applying patch failed, please commit manually!"
echo "Patch: $patch"
echo "Repo: $repo"
echo "Original commit: $(head -n 1 "$patch"|sed 's|From ||;s| .*||')"
echo "----------------------------------"
read -p "Press enter after committing resolved conflicts: "
}