From 2a420b85efd1afb0c47805b2f3518136b223ffa8 Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zetok@openmailbox.org>
Date: Tue, 12 Jul 2016 19:47:49 +0100
Subject: [PATCH] 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.
---
 merge-pr.sh              | 2 +-
 test-pr.sh               | 7 ++++---
 tools/lib/PR_bash.source | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/merge-pr.sh b/merge-pr.sh
index dce6ef463..c2a55936f 100755
--- a/merge-pr.sh
+++ b/merge-pr.sh
@@ -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
 }
diff --git a/test-pr.sh b/test-pr.sh
index a74156eed..57b058a1d 100755
--- a/test-pr.sh
+++ b/test-pr.sh
@@ -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
diff --git a/tools/lib/PR_bash.source b/tools/lib/PR_bash.source
index 0a857e2ba..11e6edb6a 100644
--- a/tools/lib/PR_bash.source
+++ b/tools/lib/PR_bash.source
@@ -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)"
 }