diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-06-25 14:53:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-25 14:53:46 +0000 |
| commit | c5ceeb16258d5d787845840036c57f9fdfdcad34 (patch) | |
| tree | 613698381def3d70986cef771ba6226003845a75 | |
| parent | 185307d1dd1e63a8cf139c55f26895a6b378d43b (diff) | |
| parent | db75704bfc12546bfbce96aea0be5c283df18314 (diff) | |
| download | git-repo-c5ceeb16258d5d787845840036c57f9fdfdcad34.tar.gz | |
Merge "Fix 'repo cherry-pick' to avoid hanging on commit-msg update."
| -rw-r--r-- | subcmds/cherry_pick.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py index 520e4c32..1f7dffdc 100644 --- a/subcmds/cherry_pick.py +++ b/subcmds/cherry_pick.py | |||
| @@ -76,6 +76,7 @@ change id will be added. | |||
| 76 | capture_stdout = True, | 76 | capture_stdout = True, |
| 77 | capture_stderr = True) | 77 | capture_stderr = True) |
| 78 | p.stdin.write(new_msg) | 78 | p.stdin.write(new_msg) |
| 79 | p.stdin.close() | ||
| 79 | if p.Wait() != 0: | 80 | if p.Wait() != 0: |
| 80 | print("error: Failed to update commit message", file=sys.stderr) | 81 | print("error: Failed to update commit message", file=sys.stderr) |
| 81 | sys.exit(1) | 82 | sys.exit(1) |