cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pruning mentions from mirrored commit messages. (#446)

Browse Source 
* Let's disable docker publishing

* Update merge-upstream-pull-request.sh
This commit is contained in:
Useroth
2020-09-14 01:07:43 +01:00
committed by GitHub
parent 79a32a11e4
commit a2c5d78d19
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skyrat/tools/merge-upstream-pull-request.sh
+9
View File
@@ -78,6 +78,8 @@ if echo "$CHERRY_PICK_OUTPUT" | grep -i 'error: mainline was specified but commi
# Add all files onto this branch
git add -A .
git -c core.editor=true cherry-pick --continue
# Prune any possible mentions from the commit message.
git commit -m "$(git -c core.editor=true log -1 --pretty=%B | sed 's/@/@ /g')" --amend
done
else
echo "Cherry-picking: $MERGE_SHA"
@@ -85,17 +87,24 @@ if echo "$CHERRY_PICK_OUTPUT" | grep -i 'error: mainline was specified but commi
# Add all files onto this branch
git add -A .
git -c core.editor=true cherry-pick --continue
# Prune any possible mentions from the commit message.
git commit -m "$(git -c core.editor=true log -1 --pretty=%B | sed 's/@/@ /g')" --amend
fi
else
# Add all files onto this branch
echo "Adding files to branch:"
git add -A .
# Prune any possible mentions from the commit message.
git commit -m "$(git -c core.editor=true log -1 --pretty=%B | sed 's/@/@ /g')" --amend
fi
# Commit these changes
echo "Commiting changes"
git -c core.editor=true commit --allow-empty -m "$2"
# Prune any possible mentions from the commit message.
git commit -m "$(git -c core.editor=true log -1 --pretty=%B | sed 's/@/@ /g')" --amend
# Push them onto the branch
echo "Pushing changes"
git push -u origin "$BASE_BRANCH_NAME$1"