InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-number cannot commit-tree without user config

Browse Source 
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
This commit is contained in:
nodir@chromium.org
2014-04-03 01:43:32 +00:00
parent ead4c7e58f
commit ee740705e9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
git_number.py
View File

@@ -37,6 +37,8 @@ CHUNK_FMT = '!20sL'
CHUNK_SIZE = struct.calcsize(CHUNK_FMT) CHUNK_SIZE = struct.calcsize(CHUNK_FMT)
DIRTY_TREES = collections.defaultdict(int) DIRTY_TREES = collections.defaultdict(int)
REF = 'refs/number/commits' 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. # 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 # 0 is slow to deserialize. 2 creates way too much bookeeping overhead (would
@@ -153,7 +155,14 @@ def finalize(targets):
assert updater.returncode == 0 assert updater.returncode == 0
tree_id = git.run('write-tree', env=env) 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: for t in targets:
commit_cmd.extend(['-p', binascii.hexlify(t)]) commit_cmd.extend(['-p', binascii.hexlify(t)])
commit_cmd.append(tree_id) commit_cmd.append(tree_id)