mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
chore(test-pr.sh): commit merge as qTox testing <>
With this one doesn't need to even have git properly configured to test a PR.
This commit is contained in:
parent
9bd8ec0193
commit
2a420b85ef
|
@ -55,7 +55,7 @@ main() {
|
|||
add_remote
|
||||
get_sources
|
||||
|
||||
merge "-S" \
|
||||
merge git merge -S \
|
||||
&& after_merge_msg $merge_branch \
|
||||
|| after_merge_failure_msg $merge_branch
|
||||
}
|
||||
|
|
|
@ -54,7 +54,8 @@ main() {
|
|||
add_remote "https"
|
||||
get_sources
|
||||
|
||||
merge "--no-gpg-sign" \
|
||||
merge git -c user.email='<>' -c user.name='qTox testing' \
|
||||
merge --no-gpg-sign \
|
||||
&& after_merge_msg $merge_branch \
|
||||
|| after_merge_failure_msg $merge_branch
|
||||
}
|
||||
|
|
|
@ -104,8 +104,7 @@ get_sources() {
|
|||
|
||||
# check whether to sign
|
||||
merge() {
|
||||
local signed="$@"
|
||||
git merge --no-ff $signed $PR -m "Merge pull request #$PR
|
||||
"${@}" --no-ff $PR -m "Merge pull request #$PR
|
||||
$OPT_MSG
|
||||
$(git shortlog master..$PR)"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user