StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(test-pr.sh): commit merge as qTox testing <>

Browse Source 
With this one doesn't need to even have git properly configured to test
a PR.
This commit is contained in:
Zetok Zalbavar 2016-07-12 19:47:49 +01:00
parent 9bd8ec0193
commit 2a420b85ef
No known key found for this signature in database
GPG Key ID: C953D3880212068A
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-pr.sh
View File

@ -55,7 +55,7 @@ main() {
add_remote add_remote
get_sources get_sources
merge "-S" \ merge git merge -S \
&& after_merge_msg $merge_branch \ && after_merge_msg $merge_branch \
|| after_merge_failure_msg $merge_branch || after_merge_failure_msg $merge_branch
} }

7
test-pr.sh
View File

@ -54,8 +54,9 @@ main() {
add_remote "https" add_remote "https"
get_sources get_sources
merge "--no-gpg-sign" \ merge git -c user.email='<>' -c user.name='qTox testing' \
&& after_merge_msg $merge_branch \ merge --no-gpg-sign \
|| after_merge_failure_msg $merge_branch && after_merge_msg $merge_branch \
|| after_merge_failure_msg $merge_branch
} }
main main

3
tools/lib/PR_bash.source
View File

@ -104,8 +104,7 @@ get_sources() {
# check whether to sign # check whether to sign
merge() { merge() {
local signed="$@" "${@}" --no-ff $PR -m "Merge pull request #$PR
git merge --no-ff $signed $PR -m "Merge pull request #$PR
$OPT_MSG $OPT_MSG
$(git shortlog master..$PR)" $(git shortlog master..$PR)"
} }