git-number cannot commit-tree without user config

git_number.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Usage: %prog [options] [<commitref>]*
 
 If no <commitref>'s are supplied, it defaults to HEAD.
 
 Calculates the generation number for one or more commits in a git repo.
@@ skipping 116 matching lines @@
   This in particular saves the trees referred to by DIRTY_TREES.
   """
   if not DIRTY_TREES:
     return
 
   msg = 'git-number Added %s numbers' % sum(DIRTY_TREES.itervalues())
 
   idx = os.path.join(git.run('rev-parse', '--git-dir'), 'number.idx')
   env = os.environ.copy()
   env['GIT_INDEX_FILE'] = idx
+  # Git user.name and/or user.email may not be configured, so specifying them

[agable, 2014/04/02 23:29:47]

Nonono. These environment variables, if present, override any configuration in
the user's .gitconfig. At the very least we should only set these environment
variables if we absolutely have to. Even better, we should simply make sure all
of our systems have .gitconfig set up properly.

+  # explicitly. They are not used, but requried by Git.
+  env['GIT_AUTHOR_NAME'] = 'git-number'
+  env['GIT_AUTHOR_EMAIL'] = 'chrome-infrastructure-team@google.com'
+  env['GIT_COMMITTER_NAME'] = env['GIT_AUTHOR_NAME']
+  env['GIT_COMMITTER_EMAIL'] = env['GIT_AUTHOR_EMAIL']
 
   progress_message = 'Finalizing: (%%(count)d/%d)' % len(DIRTY_TREES)
   with git.ProgressPrinter(progress_message) as inc:
     git.run('read-tree', REF, env=env)
 
     prefixes_trees = ((p, get_number_tree(p)) for p in sorted(DIRTY_TREES))
     updater = subprocess2.Popen(['git', 'update-index', '-z', '--index-info'],
                                 stdin=subprocess2.PIPE, env=env)
 
     with git.ScopedPool(kind=POOL_KIND) as leaf_pool:
       for item in leaf_pool.imap(leaf_map_fn, prefixes_trees):
         updater.stdin.write(item)
         inc()
 
     updater.stdin.close()
     updater.wait()
     assert updater.returncode == 0
 
     tree_id = git.run('write-tree', env=env)
     commit_cmd = ['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)
-    commit_hash = git.run(*commit_cmd)
+    commit_hash = git.run(*commit_cmd, env=env)
     git.run('update-ref', REF, commit_hash)
   DIRTY_TREES.clear()
 
 
 def preload_tree(prefix):
   """Returns the prefix and parsed tree object for the specified prefix."""
   return prefix, get_number_tree(prefix)
 
 
 def all_prefixes(depth=PREFIX_LEN):
@@ skipping 87 matching lines @@
       finalize(targets)
 
     print '\n'.join(map(str, map(get_num, targets)))
     return 0
   except KeyboardInterrupt:
     return 1
 
 
 if __name__ == '__main__':  # pragma: no cover
   sys.exit(main())