summaryrefslogtreecommitdiffstats
path: root/subcmds/cherry_pick.py
diff options
context:
space:
mode:
Diffstat (limited to 'subcmds/cherry_pick.py')
-rw-r--r--subcmds/cherry_pick.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/subcmds/cherry_pick.py b/subcmds/cherry_pick.py
index a541a040..bd396fab 100644
--- a/subcmds/cherry_pick.py
+++ b/subcmds/cherry_pick.py
@@ -46,8 +46,8 @@ change id will be added.
46 46
47 p = GitCommand(None, 47 p = GitCommand(None,
48 ['rev-parse', '--verify', reference], 48 ['rev-parse', '--verify', reference],
49 capture_stdout = True, 49 capture_stdout=True,
50 capture_stderr = True) 50 capture_stderr=True)
51 if p.Wait() != 0: 51 if p.Wait() != 0:
52 print(p.stderr, file=sys.stderr) 52 print(p.stderr, file=sys.stderr)
53 sys.exit(1) 53 sys.exit(1)
@@ -61,8 +61,8 @@ change id will be added.
61 61
62 p = GitCommand(None, 62 p = GitCommand(None,
63 ['cherry-pick', sha1], 63 ['cherry-pick', sha1],
64 capture_stdout = True, 64 capture_stdout=True,
65 capture_stderr = True) 65 capture_stderr=True)
66 status = p.Wait() 66 status = p.Wait()
67 67
68 print(p.stdout, file=sys.stdout) 68 print(p.stdout, file=sys.stdout)
@@ -74,9 +74,9 @@ change id will be added.
74 new_msg = self._Reformat(old_msg, sha1) 74 new_msg = self._Reformat(old_msg, sha1)
75 75
76 p = GitCommand(None, ['commit', '--amend', '-F', '-'], 76 p = GitCommand(None, ['commit', '--amend', '-F', '-'],
77 provide_stdin = True, 77 provide_stdin=True,
78 capture_stdout = True, 78 capture_stdout=True,
79 capture_stderr = True) 79 capture_stderr=True)
80 p.stdin.write(new_msg) 80 p.stdin.write(new_msg)
81 p.stdin.close() 81 p.stdin.close()
82 if p.Wait() != 0: 82 if p.Wait() != 0: