diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2013-05-13 19:22:14 -0400 |
|---|---|---|
| committer | Jenkins <jenkins@review.openstack.org> | 2013-05-15 18:56:01 +0000 |
| commit | b67aba1d94ee95399ed09bd287be16fbf558d8dc (patch) | |
| tree | 0acde07ea0624e59166eebe27c366ee8bb9e29da /etc | |
| parent | 86a88aaa98207e52d16fbaa6a33ce0a62c6daee5 (diff) | |
| download | zuul-b67aba1d94ee95399ed09bd287be16fbf558d8dc.tar.gz | |
Add the ability to set git user.email and user.name
It is possible the host system does not have git properly configured,
which results in merge failures because the git client is complain. For
example:
GitCommandError: 'git merge FETCH_HEAD' returned exit status 128:
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
Now we can pass user.name and user.email settings to git, if configured
to do so.
Change-Id: I896194d8d1f5334026954b02f3a1a8dd82bed2ac
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/29015
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/zuul.conf-sample | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/zuul.conf-sample b/etc/zuul.conf-sample index 75d1ca5fa..47e1d7e8c 100644 --- a/etc/zuul.conf-sample +++ b/etc/zuul.conf-sample @@ -15,4 +15,6 @@ log_config=/etc/zuul/logging.conf pidfile=/var/run/zuul/zuul.pid state_dir=/var/lib/zuul git_dir=/var/lib/zuul/git +;git_user_email=zuul@example.com +;git_user_name=zuul status_url=https://jenkins.example.com/zuul/status |