Allow trunk to not end in a slash for git_footers.

git_footers.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import argparse
 import re
 import sys
 
 from collections import defaultdict
@@ skipping 63 matching lines @@
     match = CHROME_COMMIT_POSITION_PATTERN.match(position)
     assert match, 'Invalid Cr-Commit-Position value: %s' % position
     return (match.group(1), match.group(2))
 
   svn_commit = get_unique(footers, 'git-svn-id')
   if svn_commit:
     match = GIT_SVN_ID_PATTERN.match(svn_commit)
     assert match, 'Invalid git-svn-id value: %s' % svn_commit
     # Assume that any trunk svn revision will match the commit-position
     # semantics.
-    if re.match('.*/trunk/.*$', match.group(1)):
+    if re.match('.*/trunk.*$', match.group(1)):
       return ('refs/heads/master', match.group(2))
 
     # But for now only support faking branch-heads for chrome.
     branch_match = re.match('.*/chrome/branches/([\w/-]+)/src$', match.group(1))
     if branch_match:
       # svn commit numbers do not map to branches.
       return ('refs/branch-heads/%s' % branch_match.group(1), None)
 
   raise ValueError('Unable to infer commit position from footers')
 
@@ skipping 31 matching lines @@
     assert pos[1], 'No valid position for commit'
     print pos[1]
   else:
     for k in footers.keys():
       for v in footers[k]:
         print '%s: %s' % (k, v)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))