Add file exclusion to trunk patch creation in push-to-trunk.

tools/push-to-trunk/test_scripts.py

Index: tools/push-to-trunk/test_scripts.py
diff --git a/tools/push-to-trunk/test_scripts.py b/tools/push-to-trunk/test_scripts.py
index 112efdfe29a47caf40bf1b62b6072146bb751dd5..207cac45e8531584fb233430b0264e146fd452b0 100644
--- a/tools/push-to-trunk/test_scripts.py
+++ b/tools/push-to-trunk/test_scripts.py
@@ -589,7 +589,8 @@ class ScriptTest(unittest.TestCase):
       f.write(change_log)
 
     self.ExpectGit([
-      Git("diff svn/trunk hash1", "patch content"),
+      Git("diff --name-only svn/trunk hash1", "file1\nfile2\n"),
+      Git("diff svn/trunk hash1 file1 file2", "patch content"),
       Git("svn find-rev hash1", "123455\n"),
     ])
 
@@ -710,7 +711,8 @@ Performance and stability improvements on all platforms.""", commit)
       Git(("log -1 --format=%H --grep=\"Prepare push to trunk.  "
            "Now working on version 3.22.6.\""),
           "hash1\n"),
-      Git("diff svn/trunk hash1", "patch content\n"),
+      Git("diff --name-only svn/trunk hash1", "file1\nfile2\n"),
+      Git("diff svn/trunk hash1 file1 file2", "patch content"),
       Git("svn find-rev hash1", "123455\n"),
       Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], ""),
       Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),