Browse Source

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.
pull/3504/head
Zetok Zalbavar 9 years ago
parent
commit
2a420b85ef
No known key found for this signature in database
GPG Key ID: C953D3880212068A
  1. 2
      merge-pr.sh
  2. 7
      test-pr.sh
  3. 3
      tools/lib/PR_bash.source

2
merge-pr.sh

@ -55,7 +55,7 @@ main() { @@ -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
}

7
test-pr.sh

@ -54,8 +54,9 @@ main() { @@ -54,8 +54,9 @@ main() {
add_remote "https"
get_sources
merge "--no-gpg-sign" \
&& after_merge_msg $merge_branch \
|| after_merge_failure_msg $merge_branch
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
}
main

3
tools/lib/PR_bash.source

@ -104,8 +104,7 @@ get_sources() { @@ -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…
Cancel
Save