diff options
Diffstat (limited to 'subcmds/upload.py')
| -rw-r--r-- | subcmds/upload.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py index 25827c91..b81cf0a8 100644 --- a/subcmds/upload.py +++ b/subcmds/upload.py | |||
| @@ -441,14 +441,14 @@ Gerrit Code Review: https://www.gerritcodereview.com/ | |||
| 441 | def _GetMergeBranch(self, project): | 441 | def _GetMergeBranch(self, project): |
| 442 | p = GitCommand(project, | 442 | p = GitCommand(project, |
| 443 | ['rev-parse', '--abbrev-ref', 'HEAD'], | 443 | ['rev-parse', '--abbrev-ref', 'HEAD'], |
| 444 | capture_stdout = True, | 444 | capture_stdout=True, |
| 445 | capture_stderr = True) | 445 | capture_stderr=True) |
| 446 | p.Wait() | 446 | p.Wait() |
| 447 | local_branch = p.stdout.strip() | 447 | local_branch = p.stdout.strip() |
| 448 | p = GitCommand(project, | 448 | p = GitCommand(project, |
| 449 | ['config', '--get', 'branch.%s.merge' % local_branch], | 449 | ['config', '--get', 'branch.%s.merge' % local_branch], |
| 450 | capture_stdout = True, | 450 | capture_stdout=True, |
| 451 | capture_stderr = True) | 451 | capture_stderr=True) |
| 452 | p.Wait() | 452 | p.Wait() |
| 453 | merge_branch = p.stdout.strip() | 453 | merge_branch = p.stdout.strip() |
| 454 | return merge_branch | 454 | return merge_branch |
