Index: tools/push-to-trunk/push_to_trunk.py |
diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/push-to-trunk/push_to_trunk.py |
index 6ec03cbe031d2dcb1d40a7a851ea3270779f3afd..9f72cd2d6dafa4cbbfb404f2668a7591f205fb00 100755 |
--- a/tools/push-to-trunk/push_to_trunk.py |
+++ b/tools/push-to-trunk/push_to_trunk.py |
@@ -221,18 +221,10 @@ class CommitRepository(Step): |
self.WaitForLGTM() |
# Re-read the ChangeLog entry (to pick up possible changes). |
# FIXME(machenbach): This was hanging once with a broken pipe. |
- TextToFile(Command("cat %s | awk --posix '{\ |
- if ($0 ~ /^[0-9]{4}-[0-9]{2}-[0-9]{2}:/) {\ |
- if (in_firstblock == 1) {\ |
- exit 0;\ |
- } else {\ |
- in_firstblock = 1;\ |
- }\ |
- };\ |
- print $0;\ |
- }'" % self.Config(CHANGELOG_FILE)), self.Config(CHANGELOG_ENTRY_FILE)) |
- |
- if self.Git("cl dcommit", "PRESUBMIT_TREE_CHECK=\"skip\"") is None: |
+ TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)), |
+ self.Config(CHANGELOG_ENTRY_FILE)) |
+ |
+ if self.Git("cl dcommit -v", "PRESUBMIT_TREE_CHECK=\"skip\"") is None: |
self.Die("'git cl dcommit' failed, please try again.") |