From b67aba1d94ee95399ed09bd287be16fbf558d8dc Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 13 May 2013 19:22:14 -0400 Subject: 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 Reviewed-on: https://review.openstack.org/29015 Reviewed-by: James E. Blair Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- etc/zuul.conf-sample | 2 ++ 1 file changed, 2 insertions(+) (limited to 'etc/zuul.conf-sample') 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 -- cgit v1.2.1