Push pending tag and synthesized commit in a single git push operation.

infra/libs/git2/test/repo_test.py

 # 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 hashlib
 import shutil
 import sys
 
 from infra.libs import git2
 from infra.libs.git2.test import test_util
@@ skipping 79 matching lines @@
   def testIntern(self):
     r = self.mkRepo()
     hsh = r.intern('catfood')
     self.assertEqual(hsh, hashlib.sha1('blob 7\0catfood').hexdigest())
     self.assertEqual('catfood', r.run('cat-file', 'blob', hsh))
 
   def testGetRef(self):
     r = self.mkRepo()
     self.assertEqual(r['refs/heads/branch_Z'].commit.hsh,
                      'c9813df312aae7cadb91b0d4eb89ad1a4d1b22c9')
+
+  def testNonFastForward(self):
+    r = self.mkRepo()
+    O = r['refs/heads/branch_O']
+    D = r.get_commit(self.repo['D'])
+    with self.assertRaises(git2.CalledProcessError):
+      r.fast_forward_push({O: D})
+    self.assertEqual(
+        self.repo.git('rev-parse', 'branch_O').stdout.strip(),
+        self.repo['O'])
+
+  def testFastForward(self):
+    r = self.mkRepo()
+    O = r['refs/heads/branch_O']
+    S = r.get_commit(self.repo['S'])
+    self.capture_stdio(r.fast_forward_push, {O: S})
+    self.assertEqual(O.commit.hsh, self.repo['S'])
+    self.assertEqual(
+        self.repo.git('rev-parse', 'branch_O').stdout.strip(),
+        self.repo['S'])