From ee740705e9abb86c5b4c89ef9784e1211a8b89fd Mon Sep 17 00:00:00 2001 From: "nodir@chromium.org" Date: Thu, 3 Apr 2014 01:43:32 +0000 Subject: [PATCH] git-number cannot commit-tree without user config user.name and/or user.email may be not configured, so specify them explictly for commit-tree. R=iannucci@chromium.org BUG=354276 Review URL: https://codereview.chromium.org/222103006 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@261256 0039d316-1c4b-4281-b951-d872f2087c98 --- git_number.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git_number.py b/git_number.py index 6c11cee23..7fa0398af 100755 --- a/git_number.py +++ b/git_number.py @@ -37,6 +37,8 @@ CHUNK_FMT = '!20sL' CHUNK_SIZE = struct.calcsize(CHUNK_FMT) DIRTY_TREES = collections.defaultdict(int) REF = 'refs/number/commits' +AUTHOR_NAME = 'git-number' +AUTHOR_EMAIL = 'chrome-infrastructure-team@google.com' # Number of bytes to use for the prefix on our internal number structure. # 0 is slow to deserialize. 2 creates way too much bookeeping overhead (would @@ -153,7 +155,14 @@ def finalize(targets): assert updater.returncode == 0 tree_id = git.run('write-tree', env=env) - commit_cmd = ['commit-tree', '-m', msg, '-p'] + git.hash_multi(REF) + commit_cmd = [ + # Git user.name and/or user.email may not be configured, so specifying + # them explicitly. They are not used, but requried by Git. + '-c', 'user.name=%s' % AUTHOR_NAME, + '-c', 'user.email=%s' % AUTHOR_EMAIL, + 'commit-tree', + '-m', msg, + '-p'] + git.hash_multi(REF) for t in targets: commit_cmd.extend(['-p', binascii.hexlify(t)]) commit_cmd.append(tree_id)