<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none"><!-- p { margin-top: 0px; margin-bottom: 0px; }--></style>
</head>
<body dir="ltr">
<div id="OWAFontStyleDivID" style="font-size:12pt;color:#000000;background-color:#FFFFFF;font-family:Calibri,Arial,Helvetica,sans-serif;">
<p>Hi-<br>
</p>
<p><br>
</p>
<p>With Zuul-Merger, for certain patches, I get the following error,<br>
</p>
<p><br>
</p>
<div>2014-05-26 14:34:08,987 DEBUG zuul.Merger: Merging for change 84072,7.</div>
<div>2014-05-26 14:34:08,987 DEBUG zuul.Merger: Processing refspec refs/changes/72/84072/7 for project openstack/neutron / master ref Zb61a061c0055435599c02aa7fc2476ba</div>
<div>2014-05-26 14:34:08,990 DEBUG zuul.Merger: Unable to find commit for ref master/Zb61a061c0055435599c02aa7fc2476ba</div>
<div>2014-05-26 14:34:08,990 DEBUG zuul.Merger: No base commit found for (u'openstack/neutron', u'master')</div>
<div>2014-05-26 14:34:08,991 DEBUG zuul.Repo: Resetting repository /var/lib/zuul/git/openstack/neutron</div>
<div>2014-05-26 14:34:08,992 DEBUG zuul.Repo: Updating repository /var/lib/zuul/git/openstack/neutron</div>
<div>2014-05-26 14:34:53,378 DEBUG zuul.Repo: Checking out 362e0bd0c545e1f27b2d79fe708430161c7aec2e</div>
<div>2014-05-26 14:36:39,155 DEBUG zuul.Repo: Merging refs/changes/72/84072/7 with args ['-s', 'resolve', 'FETCH_HEAD']</div>
<div>2014-05-26 14:36:39,184 DEBUG zuul.Merger: Unable to merge {u'oldrev': None, u'newrev': None, u'refspec': u'refs/changes/72/84072/7', u'merge_mode': 2, u'number': u'84072', u'project': u'openstack/neutron', u'url': u'ssh://freescale-ci@review.openstack.org:29418/openstack/neutron',
u'branch': u'master', u'patchset': u'7', u'ref': u'Zb61a061c0055435599c02aa7fc2476ba'}</div>
<div>Traceback (most recent call last):</div>
<div> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 214, in _mergeChange</div>
<div> commit = repo.merge(item['refspec'], 'resolve')</div>
<div> File "/usr/local/lib/python2.7/dist-packages/zuul/merger/merger.py", line 118, in merge</div>
<div> repo.git.merge(*args)</div>
<div> File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 227, in <lambda></div>
<div> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)</div>
<div> File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 456, in _call_process</div>
<div> return self.execute(call, **_kwargs)</div>
<div> File "/usr/local/lib/python2.7/dist-packages/git/cmd.py", line 377, in execute</div>
<div> raise GitCommandError(command, status, stderr_value)</div>
<div>GitCommandError: 'git merge -s resolve FETCH_HEAD' returned exit status 128:</div>
<div>*** Please tell me who you are.</div>
<div><br>
</div>
<div>Run</div>
<div><br>
</div>
<div> git config --global user.email "you@example.com"</div>
<div> git config --global user.name "Your Name"</div>
<div><br>
</div>
<div>to set your account's default identity.</div>
<div>Omit --global to set the identity only in this repository.</div>
<div><br>
</div>
<div>fatal: empty ident <zuul@freescale-openstack-ci.(none)> not allowed</div>
<div><br>
<br>
</div>
<div>Certain patches go a smooth way. <br>
</div>
<div><br>
</div>
<div>Do I need to configure Zuul with some other parameters?<br>
</div>
<div><br>
</div>
<div>With this error, Zuul reports to gerrit with "Merge Failed" error.<br>
</div>
<div><br>
</div>
<div>Kindly help me resolve the issue.<br>
</div>
<div><br>
</div>
<div>-<br>
</div>
<div>Trinath<br>
</div>
<p><br>
</p>
</div>
</body>
</html>