rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 07:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench: make sure try_merge does not fail because of git settings

Browse Source
This commit is contained in:
Rainer Gerhards 2017-10-27 12:01:12 +02:00
parent 0507f3cdc1
commit a4e4d2ef34
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/CI/try_merge.sh
View File

@ -1,7 +1,9 @@
#!/bin/bash
oldbranch=`git rev-parse --abbrev-ref HEAD`
git config --global user.email "buildbot@rsyslog.com"
git config --global user.name "buildbot"
# note: we usually do not have permissons to modify git config --global,
# so we do it just to the local context, which is fine with us.
git config user.email "buildbot@rsyslog.com"
git config user.name "buildbot"
# we need to make sure we can pull in new code from the main
# repo. Travis, for example, checks us out into a different repo.