| commit | c5ceeb16258d5d787845840036c57f9fdfdcad34 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Jun 25 14:53:46 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jun 25 14:53:46 2015 +0000 |
| tree | 613698381def3d70986cef771ba6226003845a75 | |
| parent | 185307d1dd1e63a8cf139c55f26895a6b378d43b [diff] | |
| parent | db75704bfc12546bfbce96aea0be5c283df18314 [diff] |
Merge "Fix 'repo cherry-pick' to avoid hanging on commit-msg update."
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index 520e4c3..1f7dffd 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py
@@ -76,6 +76,7 @@ capture_stdout = True, capture_stderr = True) p.stdin.write(new_msg) + p.stdin.close() if p.Wait() != 0: print("error: Failed to update commit message", file=sys.stderr) sys.exit(1)